summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-11-02 12:14:56 -0500
committerDave Parks <davep@lindenlab.com>2022-11-02 12:14:56 -0500
commitc3f94ab9a1da2c0c5304ff624b54fad6a43506ae (patch)
tree49e631ff416a4d309be3a4e041538d189a530c1c /indra/newview
parent0ea5b38b8dd83bc584c1ce652753f7c689b96136 (diff)
SL-18520 Use GLTF material.extras to pass flags for enabling overriding alpha mode and double sided to default
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmaterialeditor.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 0ae8dcbcf7..004d61a2ec 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2312,7 +2312,13 @@ public:
std::string overrides_json = material->asJSON();
-
+#if 1
+ // debug
+ std::string err, warn;
+ LLGLTFMaterial debug;
+ debug.fromJSON(overrides_json, warn, err);
+#endif
+
LLSD overrides = llsd::map(
"object_id", objectp->getID(),
"side", te,