Revert "SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material (pull request #1190)"

1 files changed, 0 insertions, 26 deletions

diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index ee1931a27b..6d23cb8039 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -61,29 +61,6 @@ LLMatrix3 LLGLTFMaterial::TextureTransform::asMatrix()
     return offset * rotation * scale;
 }
 
-LLGLTFMaterial::LLGLTFMaterial(bool for_override)
-: LLGLTFMaterial()
-{
-    if (for_override)
-    {
-        setBaseColorId(mBaseColorId, for_override);
-        setNormalId(mNormalId, for_override);
-        setMetallicRoughnessId(mMetallicRoughnessId, for_override);
-        setEmissiveId(mEmissiveId, for_override);
-
-        setBaseColorFactor(mBaseColor, for_override);
-        setAlphaCutoff(mAlphaCutoff, for_override);
-        setEmissiveColorFactor(mEmissiveColor, for_override);
-        setMetallicFactor(mMetallicFactor, for_override);
-        setRoughnessFactor(mRoughnessFactor, for_override);
-        setAlphaMode(mAlphaMode, for_override);
-        setDoubleSided(mDoubleSided, for_override);
-
-        // *NOTE: Texture offsets only exist in overrides, so there is no need
-        // to hack in the override value here.
-    }
-}
-
 LLGLTFMaterial::LLGLTFMaterial(const LLGLTFMaterial& rhs)
 {
     *this = rhs;
@@ -611,9 +588,6 @@ void LLGLTFMaterial::applyOverrideUUID(LLUUID& dst_id, const LLUUID& override_id
     }
 }
 
-// Make a static default material override for editing materials
-const LLGLTFMaterial LLGLTFMaterial::sOverrideDefault{true};
-
 void LLGLTFMaterial::applyOverride(const LLGLTFMaterial& override_mat)
 {
     LL_PROFILE_ZONE_SCOPED;