From a256a18884ae8e4bc6297ca59fbd5936089ad59c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 15 May 2023 13:49:20 -0500
Subject: [PATCH] SL-19674 Disable "Blinn-Phong" when a PBR material is applied
to make it clear that those buttons are inoperable until you remove the PBR
material.
---
indra/newview/llpanelface.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index dd3fdf91d9d..7d6015f557e 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1534,6 +1534,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
getChild<LLUICtrl>("checkbox fullbright")->setValue((S32)(fullbright_flag != 0));
getChildView("checkbox fullbright")->setEnabled(editable && !has_pbr_material);
getChild<LLUICtrl>("checkbox fullbright")->setTentative(!identical_fullbright);
+ getChild<LLComboBox>("combobox matmedia")->setEnabledByValue("Materials", !has_pbr_material);
}
// Repeats per meter
--
GitLab