diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-05-25 19:28:24 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-05-25 19:37:16 +0300 |
| commit | b423900792aca2e094fac85f9aeb34b26f9c2109 (patch) | |
| tree | 77d6a144f5ba3f896849918e5f940fb033e0a01a /indra/newview/gltf/llgltfloader.h | |
| parent | d6419f729e3997c3d7cd67c7ff4ee38ab835c509 (diff) | |
#4105 Fix duplicate GLTF model instances causing upload errors
Diffstat (limited to 'indra/newview/gltf/llgltfloader.h')
| -rw-r--r-- | indra/newview/gltf/llgltfloader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/gltf/llgltfloader.h b/indra/newview/gltf/llgltfloader.h index fac5b719fb..69289aabce 100644 --- a/indra/newview/gltf/llgltfloader.h +++ b/indra/newview/gltf/llgltfloader.h @@ -168,7 +168,7 @@ private: bool parseMaterials(); void uploadMaterials(); void computeCombinedNodeTransform(const LL::GLTF::Asset& asset, S32 node_index, glm::mat4& combined_transform); - bool populateModelFromMesh(LLModel* pModel, const LL::GLTF::Mesh &mesh, const LL::GLTF::Node &node, material_map& mats); + bool populateModelFromMesh(LLModel* pModel, const LL::GLTF::Mesh &mesh, const LL::GLTF::Node &node, material_map& mats, S32 instance_count); void populateJointFromSkin(const LL::GLTF::Skin& skin); LLUUID imageBufferToTextureUUID(const gltf_texture& tex); |