mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated tinyobjloader and applied the changes

Browse Source
This commit is contained in:
Alexander Bock
2015-11-30 15:01:02 -05:00
parent 5c6943477a
commit 999f198aa3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/base/rendering/wavefrontgeometry.cpp
View File

@@ -53,9 +53,10 @@ void WavefrontGeometry::deinitialize() {
bool WavefrontGeometry::loadModel(const std::string& filename) {
std::vector<tinyobj::shape_t> shapes;
std::vector<tinyobj::material_t> materials;
std::string err = tinyobj::LoadObj(shapes, materials, filename.c_str(), filename.c_str());
std::string err;
bool success = tinyobj::LoadObj(shapes, materials, err, filename.c_str(), filename.c_str());
if (!err.empty()) {
if (!success) {
LERROR(err);
return false;
}