diff options
Diffstat (limited to 'indra/newview/lllocalgltfmaterials.h')
-rw-r--r-- | indra/newview/lllocalgltfmaterials.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h index f762dcc2ce..097f2ea30a 100644 --- a/indra/newview/lllocalgltfmaterials.h +++ b/indra/newview/lllocalgltfmaterials.h @@ -34,6 +34,7 @@ class LLScrollListCtrl; class LLGLTFMaterial; class LLViewerObject; class LLViewerFetchedTexture; +class LLFetchedGLTFMaterial; class LLLocalGLTFMaterial { @@ -53,7 +54,7 @@ public: bool updateSelf(); private: - bool loadMaterial(LLPointer<LLGLTFMaterial> raw, S32 index); + bool loadMaterial(); private: /* private enums */ enum ELinkStatus @@ -80,7 +81,9 @@ private: /* members */ S32 mUpdateRetries; S32 mMaterialIndex; // Single file can have more than one - // material needs to maintain textures + // Maintain textures and material pointers to + // make sure they won't be deleted in any way + LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial; LLPointer<LLViewerFetchedTexture> mBaseColorFetched; LLPointer<LLViewerFetchedTexture> mNormalFetched; LLPointer<LLViewerFetchedTexture> mMRFetched; |