diff options
| author | William Weaver <paperwork.resident@gmail.com> | 2025-04-04 03:06:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-04 03:06:29 +0300 |
| commit | 7c35a02225743f4d6e0ebee2d488e1f4fd48d86b (patch) | |
| tree | e50a1001c99a99faa9c7e334502dab188c213b59 /indra | |
| parent | 04af0424359d55ddb8056dc1693c078eadaee239 (diff) | |
| parent | 01dc5ae78501b631efc2886acc98fb1cea17aaa0 (diff) | |
Merge branch 'secondlife:develop' into fix/cloud-texture-loading
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index c080d72580..5a2a8ce128 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -3592,7 +3592,7 @@ void LLPanelFace::onCommitRepeatsPerMeter() bool identical_scale_t = false; LLSelectedTE::getObjectScaleS(obj_scale_s, identical_scale_s); - LLSelectedTE::getObjectScaleS(obj_scale_t, identical_scale_t); + LLSelectedTE::getObjectScaleT(obj_scale_t, identical_scale_t); if (gSavedSettings.getBOOL("SyncMaterialSettings")) { @@ -5086,6 +5086,7 @@ void LLPanelFace::LLSelectedTEMaterial::getMaxSpecularRepeats(F32& repeats, bool LLMaterial* mat = object->getTE(face)->getMaterialParams().get(); U32 s_axis = VX; U32 t_axis = VY; + LLPrimitive::getTESTAxes(face, &s_axis, &t_axis); F32 repeats_s = 1.0f; F32 repeats_t = 1.0f; if (mat) @@ -5110,6 +5111,7 @@ void LLPanelFace::LLSelectedTEMaterial::getMaxNormalRepeats(F32& repeats, bool& LLMaterial* mat = object->getTE(face)->getMaterialParams().get(); U32 s_axis = VX; U32 t_axis = VY; + LLPrimitive::getTESTAxes(face, &s_axis, &t_axis); F32 repeats_s = 1.0f; F32 repeats_t = 1.0f; if (mat) |