summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2023-03-27 15:06:27 -0700
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2023-03-27 15:06:27 -0700
commit91a9a94df115fa2a69abb6cb1a6eacb569f08eef (patch)
tree5afcc8e94c37d0aa5dc680ce32b0510ba429ef69 /indra/newview/llmaterialeditor.cpp
parent6c554c9c92a0150fdf5a177bf33269eac8341d02 (diff)
parentc20058b7a7207cb80426796d9d77864c696a5eec (diff)
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
-rw-r--r--indra/newview/llmaterialeditor.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 4cdc503af8..609d8ea5d7 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2045,6 +2045,15 @@ void LLMaterialEditor::loadMaterial(const tinygltf::Model &model_in, const std::
setFromGltfMetaData(filename, model_in, index);
+ if (getDoubleSided())
+ {
+ // SL-19392 Double sided materials double the number of pixels that must be rasterized,
+ // and a great many tools that export GLTF simply leave double sided enabled whether
+ // or not it is necessary.
+ LL_DEBUGS("MaterialEditor") << "Defaulting Double Sided to disabled on import" << LL_ENDL;
+ setDoubleSided(false);
+ }
+
markChangesUnsaved(U32_MAX);
if (open_floater)