livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support bulk material uploads.

master
Jonathan "Geenz" Goodman 2025-05-05 00:18:12 -04:00
parent dd74b361e3
commit 4dedd13e61
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloatermodelpreview.cpp
View File

@ -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
{