diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-12-08 20:15:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 20:15:47 +0200 |
| commit | 7398efb1f4ccf36f9c107e920f38c3096cca2f2f (patch) | |
| tree | d0924ad73ecbe37ef512374707b71091abab8ea7 /indra/newview/llpanelface.cpp | |
| parent | 5e8b0fb646791bb1f914b0d279042910b710c8ef (diff) | |
SL-20701 FIXED Build tool texture tab shows incorrect material parameters in some cases
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index ffcc4be290..f0f66831cb 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1094,7 +1094,21 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) prev_obj_id = objectp->getID(); } } - + else + { + if (prev_obj_id != objectp->getID()) + { + if (has_pbr_material && (mComboMatMedia->getCurrentIndex() == MATMEDIA_MATERIAL)) + { + mComboMatMedia->selectNthItem(MATMEDIA_PBR); + } + else if (!has_pbr_material && (mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR)) + { + mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL); + } + prev_obj_id = objectp->getID(); + } + } mComboMatMedia->setEnabled(editable); LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type"); |