diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-06-24 17:26:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-06-24 17:26:03 +0800 |
| commit | b024b356c75528b4d2688016d49a11e1270fb48d (patch) | |
| tree | 7913efa6bdcc38510f5e3743887c295a213f77c0 /indra/newview/llfloatermodelpreview.cpp | |
| parent | 7f48cc4f84a6e5b525570b7e1ccfad52187b6420 (diff) | |
| parent | 1a6e3286110f9e54611715b44c5f8b47d08dc310 (diff) | |
Merge tag 'Second_Life_Project#1a6e3286-GLTF_Mesh_Import' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index f962217480..84b9cb18f8 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -114,11 +114,6 @@ 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 { |