From 6dc1ec6c4e82a88c153d717f71f1e1f84fa9b376 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 10 Mar 2010 10:10:57 +0000 Subject: [PATCH] From Stephan Huber, "attached you'll find a small bugfix for the 3ds-reader. It allows reading files with relative paths again. (Hard to explain, easy to see in the diff)" --- src/osgPlugins/3ds/ReaderWriter3DS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/3ds/ReaderWriter3DS.cpp b/src/osgPlugins/3ds/ReaderWriter3DS.cpp index 26e20c99c..617b94d74 100644 --- a/src/osgPlugins/3ds/ReaderWriter3DS.cpp +++ b/src/osgPlugins/3ds/ReaderWriter3DS.cpp @@ -652,7 +652,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriter3DS::readNode(const std::string& fil // Do not use the lib3ds_file_open() as: // 1. It relies on FILE* instead of iostreams (less safe) // 2. It doesn't allow us to set a custom log output - std::ifstream fin(file.c_str(), std::ios_base::in | std::ios_base::binary); + std::ifstream fin(fileName.c_str(), std::ios_base::in | std::ios_base::binary); if (!fin.good()) return ReadResult::ERROR_IN_READING_FILE; return doReadNode(fin, options, fileName); /*