benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #176 from silverweed/master

Browse Source 
Ensure mtl_basedir ends with a directory separator
This commit is contained in:
Syoyo Fujita
2018-06-02 00:18:54 +09:00
committed by GitHub
parent d1ce2082f6 8fd9f6e57b
commit d541711a79
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tiny_obj_loader.h
View File

@@ -1155,7 +1155,7 @@ static bool exportFaceGroupToShape(shape_t *shape,
// ??? // ???
continue; continue;
} }
size_t ovi = size_t( size_t ovi = size_t(
remainingFace.vertex_indices[idx] remainingFace.vertex_indices[idx]
.v_idx); .v_idx);
@@ -1739,6 +1739,13 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
std::string baseDir; std::string baseDir;
if (mtl_basedir) { if (mtl_basedir) {
baseDir = mtl_basedir; baseDir = mtl_basedir;
#ifndef _WIN32
const char dirsep = '/';
#else
const char dirsep = '\\';
#endif
if (baseDir[baseDir.length() - 1] != dirsep)
baseDir += dirsep;
} }
MaterialFileReader matFileReader(baseDir); MaterialFileReader matFileReader(baseDir);