From: Andrej Date: Tue, 16 May 2017 13:47:57 +0000 (+0200) Subject: Revert "Creating fileName.mtl file instead of fileName.obj.mtl" X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04dbdca3294897701a6dfb86a4bdbcd01193654b;p=platform%2Fupstream%2Fassimp.git Revert "Creating fileName.mtl file instead of fileName.obj.mtl" This reverts commit 5757980ea5b00d4c68fe7fcaa204212c31a2c8d7. --- diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp index c252cf3..564de1c 100644 --- a/code/ObjExporter.cpp +++ b/code/ObjExporter.cpp @@ -124,11 +124,6 @@ std::string ObjExporter :: GetMaterialLibName() // ------------------------------------------------------------------------------------------------ std::string ObjExporter :: GetMaterialLibFileName() { - // Remove existing .obj file extention so that the final material file name will be fileName.mtl and not fileName.obj.mtl - size_t lastdot = filename.find_last_of("."); - if (lastdot != std::string::npos) - filename = filename.substr(0, lastdot); - return filename + MaterialExt; } diff --git a/samples/SimpleOpenGL/Debug/vc140.idb b/samples/SimpleOpenGL/Debug/vc140.idb deleted file mode 100644 index 29cc472..0000000 Binary files a/samples/SimpleOpenGL/Debug/vc140.idb and /dev/null differ diff --git a/samples/SimpleOpenGL/Debug/vc140.pdb b/samples/SimpleOpenGL/Debug/vc140.pdb deleted file mode 100644 index 39a9ed3..0000000 Binary files a/samples/SimpleOpenGL/Debug/vc140.pdb and /dev/null differ diff --git a/samples/SimpleOpenGL/SimpleOpenGL.VC.db b/samples/SimpleOpenGL/SimpleOpenGL.VC.db deleted file mode 100644 index 1c7c98b..0000000 Binary files a/samples/SimpleOpenGL/SimpleOpenGL.VC.db and /dev/null differ diff --git a/samples/SimpleOpenGL/SimpleOpenGL.vcxproj.user b/samples/SimpleOpenGL/SimpleOpenGL.vcxproj.user deleted file mode 100644 index abe8dd8..0000000 --- a/samples/SimpleOpenGL/SimpleOpenGL.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/samples/SimpleOpenGL/UpgradeLog.htm b/samples/SimpleOpenGL/UpgradeLog.htm deleted file mode 100644 index 3282796..0000000 Binary files a/samples/SimpleOpenGL/UpgradeLog.htm and /dev/null differ diff --git a/samples/SimpleOpenGL/UpgradeLog2.htm b/samples/SimpleOpenGL/UpgradeLog2.htm deleted file mode 100644 index 0181993..0000000 Binary files a/samples/SimpleOpenGL/UpgradeLog2.htm and /dev/null differ