diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-22 10:38:46 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-22 10:38:46 -0500 |
| commit | 09ed1ede8dd8055a6e69b0db13f7386d3db6ea1b (patch) | |
| tree | f70d12d57003ce60011ed7f835d2befd41cc1501 /indra/newview | |
| parent | 8c7c4c424d07e39191e827f441af406724829b50 (diff) | |
| parent | 84fe4a9bc0eae45c1b5aede238a0e0483f8edf28 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 9 |
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) |