diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-05-16 13:52:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-05-16 13:52:40 +0800 |
| commit | 6d51e91895a7f2435c46a876410ccc6c63fe8c82 (patch) | |
| tree | f2b48ebd99cb414227bf365f47665b8d4baa752b /indra/newview/lltinygltfhelper.cpp | |
| parent | d1b5917bb9c92e4e47eba19b43781e4d1328b1ca (diff) | |
| parent | 094dcc07f8c1d90ae723dbe60eddacb90a09eae8 (diff) | |
Merge tag '7.1.7-release'
source for viewer 7.1.7.8974243247
Diffstat (limited to 'indra/newview/lltinygltfhelper.cpp')
| -rw-r--r-- | indra/newview/lltinygltfhelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp index 5b75db37d0..cd1b071574 100644 --- a/indra/newview/lltinygltfhelper.cpp +++ b/indra/newview/lltinygltfhelper.cpp @@ -187,7 +187,7 @@ LLImageRaw * LLTinyGLTFHelper::getTexture(const std::string & folder, const tiny bool LLTinyGLTFHelper::loadModel(const std::string& filename, tinygltf::Model& model_in) { std::string exten = gDirUtilp->getExtension(filename); - + if (exten == "gltf" || exten == "glb") { tinygltf::TinyGLTF loader; @@ -224,7 +224,7 @@ bool LLTinyGLTFHelper::loadModel(const std::string& filename, tinygltf::Model& m LL_WARNS("GLTF") << "Cannot load. File has no materials " << filename << LL_ENDL; return false; } - + return true; } |