summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llgltfmaterial.h
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2022-11-08 10:53:24 -0800
committerCosmic Linden <cosmic@lindenlab.com>2022-11-08 11:55:45 -0800
commitcba87c62cc3c31d48c680bf92aa7ae2b9555ba69 (patch)
tree28deae73bd42a8b807f2d32017a9738c719c495d /indra/llprimitive/llgltfmaterial.h
parentd72824c2b789b81b2bc0ae2c20012ca45d23a42d (diff)
SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.h')
-rw-r--r--indra/llprimitive/llgltfmaterial.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index 60116fd423..2476818b27 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -48,6 +48,8 @@ public:
// default material for reference
static const LLGLTFMaterial sDefault;
+ // default material override for reference
+ static const LLGLTFMaterial sOverrideDefault;
struct TextureTransform
{
@@ -66,6 +68,7 @@ public:
};
LLGLTFMaterial() {}
+ LLGLTFMaterial(bool for_override);
LLGLTFMaterial(const LLGLTFMaterial& rhs);
LLGLTFMaterial& operator=(const LLGLTFMaterial& rhs);