diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-10-19 15:32:18 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-10-19 15:32:18 -0700 |
| commit | 8ead80e6e5bdbbc7271b45dd29997548c38c7a53 (patch) | |
| tree | 998b47e04559c867bf688d21f5d384b94ff799a1 /indra | |
| parent | 8741c05cc10d3f39f272bb4739e7313309539d07 (diff) | |
Xcode compat fix for SL-18105 material overrides
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llprimitive/lltextureentry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index 2c932a10df..8dc3434a01 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -204,7 +204,7 @@ public: // GLTF render material // nuanced behavior here -- if there is no render material, fall back to getGLTFMaterial, but ONLY for the getter, not the setter - LLGLTFMaterial* getGLTFRenderMaterial() const { return mGLTFRenderMaterial.notNull() ? mGLTFRenderMaterial : getGLTFMaterial(); } + LLGLTFMaterial* getGLTFRenderMaterial() const { return mGLTFRenderMaterial.notNull() ? mGLTFRenderMaterial.get() : getGLTFMaterial(); } S32 setGLTFRenderMaterial(LLGLTFMaterial* mat); public: |