diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-30 17:55:17 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-30 17:55:17 +0800 |
| commit | d1353441f91d5776e1f4e72666f7c9de96eecca5 (patch) | |
| tree | cd22d6ac18a1b64cb5c2a94f793e7d7cf27a8b4b /indra/newview/llfloatermodelpreview.cpp | |
| parent | 2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff) | |
| parent | 136149d1a196d2c0c15b9977937e64ccd26c1a49 (diff) | |
Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into gltf-mesh-import
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 8332a430e6..96f9ddbf8a 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -64,6 +64,7 @@ #include "llcallbacklist.h" #include "llviewertexteditor.h" #include "llviewernetwork.h" +#include "llmaterialeditor.h" //static @@ -113,6 +114,11 @@ void LLMeshFilePicker::notify(const std::vector<std::string>& filenames) if (filenames.size() > 0) { mMP->loadModel(filenames[0], mLOD); + + if (filenames[0].substr(filenames[0].length() - 4) == ".glb" || filenames[0].substr(filenames[0].length() - 5) == ".gltf") + { + LLMaterialEditor::loadMaterialFromFile(filenames[0], -1); + } } else { |