diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-11-01 23:57:49 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-11-01 23:58:02 +0200 |
| commit | 757dc513db9ab6476c6c1c529e28752b50355882 (patch) | |
| tree | 6d1eea3fdef502cb56e5b8af35af3da10d408d23 /indra/newview/llpanelface.cpp | |
| parent | 245cfb30f67528104c3d49dd59b0d8f7613665a9 (diff) | |
SL-18448 Fix metallic and normal controls being swapped
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index f884cfe842..04957729ed 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2658,11 +2658,11 @@ void LLPanelFace::updateVisibility() { updateShinyControls(); } - getChildView("shinyScaleU")->setVisible(show_shininess || show_pbr_normal); - getChildView("shinyScaleV")->setVisible(show_shininess || show_pbr_normal); - getChildView("shinyRot")->setVisible(show_shininess || show_pbr_normal); - getChildView("shinyOffsetU")->setVisible(show_shininess || show_pbr_normal); - getChildView("shinyOffsetV")->setVisible(show_shininess || show_pbr_normal); + getChildView("shinyScaleU")->setVisible(show_shininess || show_pbr_metallic); + getChildView("shinyScaleV")->setVisible(show_shininess || show_pbr_metallic); + getChildView("shinyRot")->setVisible(show_shininess || show_pbr_metallic); + getChildView("shinyOffsetU")->setVisible(show_shininess || show_pbr_metallic); + getChildView("shinyOffsetV")->setVisible(show_shininess || show_pbr_metallic); // Normal map controls if (show_bumpiness) @@ -2672,11 +2672,11 @@ void LLPanelFace::updateVisibility() getChildView("bumpytexture control")->setVisible(show_bumpiness); getChildView("combobox bumpiness")->setVisible(show_bumpiness); getChildView("label bumpiness")->setVisible(show_bumpiness); - getChildView("bumpyScaleU")->setVisible(show_bumpiness || show_pbr_metallic); - getChildView("bumpyScaleV")->setVisible(show_bumpiness || show_pbr_metallic); - getChildView("bumpyRot")->setVisible(show_bumpiness || show_pbr_metallic); - getChildView("bumpyOffsetU")->setVisible(show_bumpiness || show_pbr_metallic); - getChildView("bumpyOffsetV")->setVisible(show_bumpiness || show_pbr_metallic); + getChildView("bumpyScaleU")->setVisible(show_bumpiness || show_pbr_normal); + getChildView("bumpyScaleV")->setVisible(show_bumpiness || show_pbr_normal); + getChildView("bumpyRot")->setVisible(show_bumpiness || show_pbr_normal); + getChildView("bumpyOffsetU")->setVisible(show_bumpiness || show_pbr_normal); + getChildView("bumpyOffsetV")->setVisible(show_bumpiness || show_pbr_normal); // PBR controls getChildView("pbr_control")->setVisible(show_pbr); |