From c78cd1aae63a7c7c0bf6a9c21380818aa9cd47b7 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 7 Jun 2013 14:37:39 -0700
Subject: [PATCH] NORSPEC-233 WIP fix completely bogus substitution of offsets
for scales and make scale accessors get with the program
---
indra/llprimitive/lltextureentry.h | 4 ++--
indra/newview/llpanelface.cpp | 4 ++--
indra/newview/llpanelface.h | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 59364cb9134..19edcaa27d0 100755
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -133,8 +133,8 @@ class LLTextureEntry
virtual const LLUUID &getID() const { return mID; }
const LLColor4 &getColor() const { return mColor; }
void getScale(F32 *s, F32 *t) const { *s = mScaleS; *t = mScaleT; }
- void getScaleS(F32 *s) const { *s = mScaleS; }
- void getScaleT(F32 *t) const { *t = mScaleT; }
+ F32 getScaleS() const { return mScaleS; }
+ F32 getScaleT() const { return mScaleT; }
void getOffset(F32 *s, F32 *t) const { *s = mOffsetS; *t = mOffsetT; }
F32 getOffsetS() const { return mOffsetS; }
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 51d1f826036..afc9d5b1235 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -951,7 +951,7 @@ void LLPanelFace::updateUI()
F32 spec_scale_s = 1.f;
F32 norm_scale_s = 1.f;
- LLSelectedTE::getOffsetS( diff_scale_s, identical_diff_scale_s);
+ LLSelectedTE::getScaleS( diff_scale_s, identical_diff_scale_s);
LLSelectedTEMaterial::getSpecularRepeatX( spec_scale_s, identical_spec_scale_s);
LLSelectedTEMaterial::getNormalRepeatX( norm_scale_s, identical_norm_scale_s);
@@ -990,7 +990,7 @@ void LLPanelFace::updateUI()
F32 spec_scale_t = 1.f;
F32 norm_scale_t = 1.f;
- LLSelectedTE::getOffsetT(diff_scale_t, identical_diff_scale_t);
+ LLSelectedTE::getScaleT(diff_scale_t, identical_diff_scale_t);
LLSelectedTEMaterial::getSpecularRepeatY(spec_scale_t, identical_spec_scale_t);
LLSelectedTEMaterial::getNormalRepeatY(norm_scale_t, identical_norm_scale_t);
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index d76d940d5cf..8d267fe723d 100755
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -447,6 +447,8 @@ class LLPanelFace : public LLPanel
DEF_GET_TE_STATE(F32,F32,getRotation)
DEF_GET_TE_STATE(F32,F32,getOffsetS)
DEF_GET_TE_STATE(F32,F32,getOffsetT)
+ DEF_GET_TE_STATE(F32,F32,getScaleS)
+ DEF_GET_TE_STATE(F32,F32,getScaleT)
DEF_GET_TE_STATE(F32,F32,getGlow)
DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen)
DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor)
--
GitLab