livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18632: Un-hide planar align options when editing GLTF textures in build floater

meow-7.2.2
Cosmic Linden 2022-11-16 12:04:16 -08:00
parent fd76c195c8
commit 62aa0e807f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpanelface.cpp
View File

@ -1003,6 +1003,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
radio_pbr_type->selectNthItem(PBRTYPE_RENDER_MATERIAL_ID);
}
radio_pbr_type->setEnabled(editable);
const bool pbr_selected = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR;
const bool texture_info_selected = pbr_selected && radio_pbr_type->getSelectedIndex() != PBRTYPE_RENDER_MATERIAL_ID;
getChildView("checkbox_sync_settings")->setEnabled(editable);
childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
@ -1251,9 +1253,9 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
LLCheckBoxCtrl* cb_planar_align = getChild<LLCheckBoxCtrl>("checkbox planar align");
align_planar = (cb_planar_align && cb_planar_align->get());
bool enabled = (editable && isIdenticalPlanarTexgen());
bool enabled = (editable && isIdenticalPlanarTexgen() && (!pbr_selected || texture_info_selected));
childSetValue("checkbox planar align", align_planar && enabled);
childSetVisible("checkbox planar align", enabled);
childSetVisible("checkbox planar align", enabled);
childSetEnabled("checkbox planar align", enabled);
childSetEnabled("button align textures", enabled && LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1);
@ -2737,8 +2739,8 @@ void LLPanelFace::updateVisibility()
// Shared material controls
getChildView("checkbox_sync_settings")->setVisible(show_material || show_media || show_texture_info);
getChildView("tex gen")->setVisible(show_material || show_media);
getChildView("combobox texgen")->setVisible(show_material || show_media);
getChildView("tex gen")->setVisible(show_material || show_media || show_texture_info);
getChildView("combobox texgen")->setVisible(show_material || show_media || show_texture_info);
getChildView("button align textures")->setVisible(show_material || show_media);
// Media controls

2
indra/newview/skins/default/xui/en/panel_tools_texture.xml
View File

@ -963,7 +963,7 @@
left="7"
name="checkbox planar align"
tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
top_delta="16"
top_delta="43"
width="260" />
<button
follows="left|top"