diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-12-02 09:56:56 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-12-02 09:56:56 -0600 |
| commit | 1a8a40c94493ec3598010db53c4bf21108b6e272 (patch) | |
| tree | 05ac839c8fa5bc967517372f04ea8ce934a3447e /indra/newview/llpanelface.cpp | |
| parent | ed2b768da29f8dc4f96b463fe4d4087deab75a37 (diff) | |
| parent | 3812fb0f41723ea359ecffaefa2ca10e83ae679f (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 3d72865f69..92e92ac6a6 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1064,7 +1064,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) F32 transparency = (1.f - color.mV[VALPHA]) * 100.f; getChild<LLUICtrl>("ColorTrans")->setValue(editable ? transparency : 0); - getChildView("ColorTrans")->setEnabled(editable); + getChildView("ColorTrans")->setEnabled(editable && has_material); // Specular map LLSelectedTEMaterial::getSpecularID(specmap_id, identical_spec); @@ -1818,11 +1818,11 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, LLUICtrl* gltfCtrlTextureOffsetU = getChild<LLUICtrl>("gltfTextureOffsetU"); LLUICtrl* gltfCtrlTextureOffsetV = getChild<LLUICtrl>("gltfTextureOffsetV"); - gltfCtrlTextureScaleU->setEnabled(show_texture_info && has_pbr_capabilities); - gltfCtrlTextureScaleV->setEnabled(show_texture_info && has_pbr_capabilities); - gltfCtrlTextureRotation->setEnabled(show_texture_info && has_pbr_capabilities); - gltfCtrlTextureOffsetU->setEnabled(show_texture_info && has_pbr_capabilities); - gltfCtrlTextureOffsetV->setEnabled(show_texture_info && has_pbr_capabilities); + gltfCtrlTextureScaleU->setEnabled(show_texture_info && has_pbr_capabilities && has_pbr_material); + gltfCtrlTextureScaleV->setEnabled(show_texture_info && has_pbr_capabilities && has_pbr_material); + gltfCtrlTextureRotation->setEnabled(show_texture_info && has_pbr_capabilities && has_pbr_material); + gltfCtrlTextureOffsetU->setEnabled(show_texture_info && has_pbr_capabilities && has_pbr_material); + gltfCtrlTextureOffsetV->setEnabled(show_texture_info && has_pbr_capabilities && has_pbr_material); // Control values are set in setMaterialOverridesFromSelection } |