summaryrefslogtreecommitdiff
path: root/indra/newview/llgltfmateriallist.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-10-19 17:23:54 -0500
committerDave Parks <davep@lindenlab.com>2022-10-19 17:23:54 -0500
commit8741c05cc10d3f39f272bb4739e7313309539d07 (patch)
tree871d2340a7e22cce1504948a79a703811a084d5a /indra/newview/llgltfmateriallist.cpp
parentde4c018499ddaebbe466fb5a8938554a2d4a3b19 (diff)
SL-18105 Hook up TE override material to render pipe by way of render material.
Diffstat (limited to 'indra/newview/llgltfmateriallist.cpp')
-rw-r--r--indra/newview/llgltfmateriallist.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 9c04ef4c38..86f4faa9d0 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -36,6 +36,7 @@
#include "llviewercontrol.h"
#include "llviewergenericmessage.h"
#include "llviewerobjectlist.h"
+#include "pipeline.h"
#include "tinygltf/tiny_gltf.h"
#include <strstream>
@@ -86,7 +87,10 @@ namespace
if(obj)
{
- obj->getTE(side)->setGLTFMaterialOverride(override_data);
+ if (obj->setTEGLTFMaterialOverride(side, override_data))
+ {
+ gPipeline.markTextured(obj->mDrawable);
+ }
}
LL_DEBUGS() << "successfully parsed override: " << override_data->asJSON() << LL_ENDL;