diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-03-13 08:06:17 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-03-13 08:06:17 -0700 |
| commit | 75dea34e3f80b054c56c38c880166d5e610eef88 (patch) | |
| tree | 8a8a54cb3e446213b33dcdd64c0c89d3c47369b4 /indra/newview/lltinygltfhelper.h | |
| parent | f3ce17701e8dbbbc7a0e8e73c740b161bb2f36c0 (diff) | |
| parent | 0e178e12562b95915a9a775cd40d3bb44729332c (diff) | |
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lltinygltfhelper.h')
| -rw-r--r-- | indra/newview/lltinygltfhelper.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltinygltfhelper.h b/indra/newview/lltinygltfhelper.h index 92c9876aff..256f6c854f 100644 --- a/indra/newview/lltinygltfhelper.h +++ b/indra/newview/lltinygltfhelper.h @@ -43,10 +43,11 @@ namespace LLTinyGLTFHelper LLImageRaw* getTexture(const std::string& folder, const tinygltf::Model& model, S32 texture_index); - S32 getMaterialCountFromFile(const std::string& filename); + bool loadModel(const std::string& filename, tinygltf::Model& model_out); - bool getMaterialFromFile( + bool getMaterialFromModel( const std::string& filename, + const tinygltf::Model& model, S32 mat_index, LLFetchedGLTFMaterial* material, std::string& material_name); |