diff options
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 2052f252b3..f05f0344bd 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -1605,6 +1605,7 @@ void LLMaterialEditor::loadAsset() if (mAssetID.isNull()) { mAssetStatus = PREVIEW_ASSET_LOADED; + loadDefaults(); setHasUnsavedChanges(false); } else @@ -1905,3 +1906,9 @@ S32 LLMaterialEditor::saveTextures() return work_count; } +void LLMaterialEditor::loadDefaults() +{ + tinygltf::Model model_in; + model_in.materials.resize(1); + setFromGltfModel(model_in, true); +} diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index 59ae00e565..cc72193a0e 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -161,6 +161,8 @@ public: void onCommitEmissiveTexture(LLUICtrl* ctrl, const LLSD& data); void onCommitNormalTexture(LLUICtrl* ctrl, const LLSD& data); + // initialize the UI from a default GLTF material + void loadDefaults(); private: friend class LLMaterialFilePicker; |