diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp index 564de1c12..c252cf390 100644 --- a/code/ObjExporter.cpp +++ b/code/ObjExporter.cpp @@ -124,6 +124,11 @@ 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 new file mode 100644 index 000000000..29cc472d9 Binary files /dev/null and b/samples/SimpleOpenGL/Debug/vc140.idb differ diff --git a/samples/SimpleOpenGL/Debug/vc140.pdb b/samples/SimpleOpenGL/Debug/vc140.pdb new file mode 100644 index 000000000..39a9ed3f6 Binary files /dev/null and b/samples/SimpleOpenGL/Debug/vc140.pdb differ diff --git a/samples/SimpleOpenGL/SimpleOpenGL.VC.db b/samples/SimpleOpenGL/SimpleOpenGL.VC.db new file mode 100644 index 000000000..1c7c98b31 Binary files /dev/null and b/samples/SimpleOpenGL/SimpleOpenGL.VC.db differ diff --git a/samples/SimpleOpenGL/SimpleOpenGL.vcxproj.user b/samples/SimpleOpenGL/SimpleOpenGL.vcxproj.user new file mode 100644 index 000000000..abe8dd896 --- /dev/null +++ b/samples/SimpleOpenGL/SimpleOpenGL.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/samples/SimpleOpenGL/UpgradeLog.htm b/samples/SimpleOpenGL/UpgradeLog.htm new file mode 100644 index 000000000..328279675 Binary files /dev/null and b/samples/SimpleOpenGL/UpgradeLog.htm differ diff --git a/samples/SimpleOpenGL/UpgradeLog2.htm b/samples/SimpleOpenGL/UpgradeLog2.htm new file mode 100644 index 000000000..01819937c Binary files /dev/null and b/samples/SimpleOpenGL/UpgradeLog2.htm differ