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

Merge pull request #179 from mlimper/master

Browse Source 
Fixed #177
This commit is contained in:
Syoyo Fujita
2018-07-09 19:29:07 +09:00
committed by GitHub
parent 7a88cddefc c4e7e65acb
commit bb3e27d4f3
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/tester.cc
View File

@@ -768,14 +768,20 @@ TEST_CASE("invalid-face-definition", "[face]") {
REQUIRE(0 == shapes[0].mesh.indices.size()); REQUIRE(0 == shapes[0].mesh.indices.size());
} }
TEST_CASE("Empty mtl basedir", "[Issue177]") { TEST_CASE("Empty mtl basedir", "[Issue177]") {
// Win32 spesific?
tinyobj::attrib_t attrib; tinyobj::attrib_t attrib;
std::vector<tinyobj::shape_t> shapes; std::vector<tinyobj::shape_t> shapes;
std::vector<tinyobj::material_t> materials; std::vector<tinyobj::material_t> materials;
std::string err; std::string err;
bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, "issue-177.obj");
// A case where the user explicitly provides an empty string
// Win32 specific?
const char * userBaseDir = "";
bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, "issue-177.obj", userBaseDir);
// if mtl loading fails, we get an error message (WARN) here
ret &= err.empty();
if (!err.empty()) { if (!err.empty()) {
std::cerr << "[Issue177] " << err << std::endl; std::cerr << "[Issue177] " << err << std::endl;

5
tiny_obj_loader.h
View File

@@ -1736,9 +1736,8 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
return false; return false;
} }
std::string baseDir; std::string baseDir = mtl_basedir ? mtl_basedir : "";
if (mtl_basedir) { if (!baseDir.empty()) {
baseDir = mtl_basedir;
#ifndef _WIN32 #ifndef _WIN32
const char dirsep = '/'; const char dirsep = '/';
#else #else