diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 15:21:49 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 15:21:49 -0700 |
| commit | 19c755b8512bb2e7ce36924b30c1ed380397a8f4 (patch) | |
| tree | 8ea11a79bd9c067abd2e91865a5065981de7aacb /indra/newview | |
| parent | 2de72023cf698a9eb412b12aade9a84e02f23ea3 (diff) | |
NORSPEC-147 make repeats per meter disabled when in planar mode and make UI reps consistent across layers
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index f55d53fa29..877c7743fa 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1537,7 +1537,7 @@ void LLPanelFace::getState() { enabled = (editable && ((shiny == SHINY_TEXTURE) && !specmap_id.isNull())); identical = identical_spec_repeats; - repeats = repeats_spec * (identical_planar_texgen ? 2.0f : 1.0f); + repeats = repeats_spec; } break; @@ -1545,12 +1545,12 @@ void LLPanelFace::getState() { enabled = (editable && ((bumpy == BUMPY_TEXTURE) && !normmap_id.isNull())); identical = identical_norm_repeats; - repeats = repeats_norm * (identical_planar_texgen ? 2.0f : 1.0f); + repeats = repeats_norm; } break; } - getChildView("rptctrl")->setEnabled(enabled); + getChildView("rptctrl")->setEnabled(identical_planar_texgen ? FALSE : enabled); getChild<LLUICtrl>("rptctrl")->setValue(editable ? repeats : 1.0f); getChild<LLUICtrl>("rptctrl")->setTentative(!identical); } @@ -1978,7 +1978,7 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata) bool show_bumpiness = (!show_media) && (material_type == MATTYPE_NORMAL) && combo_matmedia->getEnabled(); bool show_shininess = (!show_media) && (material_type == MATTYPE_SPECULAR) && combo_matmedia->getEnabled(); self->getChildView("combobox mattype")->setVisible(!show_media); - self->getChildView("rptctrl")->setVisible(show_texture); + self->getChildView("rptctrl")->setVisible(true); // Media controls self->getChildView("media_info")->setVisible(show_media); |