diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-21 18:05:19 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-21 18:05:19 -0500 |
| commit | 0cd7c3842119f1801872b4db05e17544b4eb7158 (patch) | |
| tree | a79c8ec7c24be3263c05bf0758da758a4518924b /indra/newview/llviewermenu.cpp | |
| parent | 61967623baaa8988f4f8b48043f79be29452ca80 (diff) | |
SL-18105 Hook up live material editor to current selection set and implicitly open build floater when editing a PBR material.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 5cb63426a8..47b355e554 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2970,7 +2970,7 @@ void load_life_gltf_material(bool copy) } else { - LLMaterialEditor::loadLiveMaterial(mat_id); + LLMaterialEditor::loadLiveMaterialEditor(); } LLViewerJoystick::getInstance()->moveObjects(true); @@ -2979,7 +2979,8 @@ void load_life_gltf_material(bool copy) void handle_object_edit_gltf_material() { - load_life_gltf_material(false); + handle_object_edit(); + LLMaterialEditor::loadLiveMaterialEditor(); } void handle_object_save_gltf_material() |