diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-07 09:38:43 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-07 09:38:43 -0600 |
| commit | b9b913a60ada97fc61bf2176e443dc72c8359ccb (patch) | |
| tree | a86a2a13727afb81f1eac41d78e0e169d0bdd269 /indra/newview/lltinygltfhelper.h | |
| parent | 56e5385bd25cc50ea0055f5703dc3c24a5acfc93 (diff) | |
SL-19349 Fix for hang on bulk upload of materials, add bulk upload option to material selector, incidental decruft.
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); |