Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Ensure mtl_basedir ends with a directory separator #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2018
Merged

Ensure mtl_basedir ends with a directory separator #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tiny_obj_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@ static bool exportFaceGroupToShape(shape_t *shape,
// ???
continue;
}

size_t ovi = size_t(
remainingFace.vertex_indices[idx]
.v_idx);
Expand Down Expand Up @@ -1739,6 +1739,13 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
std::string baseDir;
if (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);

Expand Down