diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-20 01:04:42 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-23 00:23:05 +0300 |
| commit | 0d217dc73c6530dcbceb306c4609e2d72da6d70b (patch) | |
| tree | 7ea8accc68ed5829107bf4002279b12ebe4a9368 /indra/newview/llmaterialeditor.h | |
| parent | 4bb419031c130402a5589ff698e28e230a0c123a (diff) | |
SL-17653 Local gltf materials #2
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index cf31eb5095..59ae00e565 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -50,7 +50,7 @@ public: void setFromGltfMetaData(const std::string& filename, tinygltf::Model& model); // open a file dialog and select a gltf/glb file for import - void importMaterial(); + static void importMaterial(); // for live preview, apply current material to currently selected object void applyToSelection(); @@ -60,6 +60,7 @@ public: void setFromGLTFMaterial(LLGLTFMaterial* mat); void loadAsset() override; + void loadMaterialFromFile(const std::string& filename); static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |