SL-17685 Drag and drop material support

1 files changed, 29 insertions, 0 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 232e51896e..753fb014c9 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -107,6 +107,7 @@
 #include "llcleanup.h"
 #include "llcallstack.h"
 #include "llmeshrepository.h"
+#include "llgltfmateriallist.h"
 #include "llgl.h"
 
 //#define DEBUG_UPDATE_TYPE
@@ -4906,6 +4907,18 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
     };
 
     LLGLTFMaterial* mat = getTE(te)->getGLTFMaterial();
+    LLUUID mat_id = getRenderMaterialID(te);
+    if (mat == nullptr && mat_id.notNull())
+    {
+        mat = gGLTFMaterialList.getMaterial(mat_id);
+        getTE(te)->setGLTFMaterial(mat);
+    }
+    else if (mat_id.isNull() && mat != nullptr)
+    {
+        mat = nullptr;
+        getTE(te)->setGLTFMaterial(nullptr);
+    }
+
     if (mat != nullptr)
     {
         mGLTFAlbedoMaps[te] = fetch_texture(mat->mAlbedoId);
@@ -4913,6 +4926,14 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
         mGLTFMetallicRoughnessMaps[te] = fetch_texture(mat->mMetallicRoughnessId);
         mGLTFEmissiveMaps[te] = fetch_texture(mat->mEmissiveId);
     }
+    else
+    {
+        mGLTFAlbedoMaps[te] = nullptr;
+        mGLTFNormalMaps[te] = nullptr;
+        mGLTFMetallicRoughnessMaps[te] = nullptr;
+        mGLTFEmissiveMaps[te] = nullptr;
+    }
+
 }
 
 void LLViewerObject::refreshBakeTexture()
@@ -7028,8 +7049,16 @@ void LLViewerObject::setRenderMaterialID(U8 te, const LLUUID& id)
 {
     if (id.notNull())
     {
+        getTE(te)->setGLTFMaterial(gGLTFMaterialList.getMaterial(id));
         setHasRenderMaterialParams(true);
     }
+    else
+    {
+        getTE(te)->setGLTFMaterial(nullptr);
+    }
+
+    faceMappingChanged();
+    gPipeline.markTextured(mDrawable);
 
     LLRenderMaterialParams* param_block = (LLRenderMaterialParams*)getParameterEntry(LLNetworkData::PARAMS_RENDER_MATERIAL);
     if (param_block)