diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-07-02 21:12:03 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-07-02 21:12:03 +0100 |
| commit | c530b3d1519e0755bf8ba8a548815856291d905c (patch) | |
| tree | 77551c0d3717437cebeb8eb67c166076ea20795d /indra | |
| parent | 5e12beba702edb036b00690e7d810a3973cc96af (diff) | |
MAINT-3219 make align planar faces set normal and specular offsets and rotations in addition to the diffuse values
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llpanelface.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 01ce4470f0..1bd8692a0e 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -550,8 +550,14 @@ struct LLPanelFaceSetAlignedTEFunctor : public LLSelectedTEFunctor if (set_aligned) { object->setTEOffset(te, uv_offset.mV[VX], uv_offset.mV[VY]); - object->setTEScale(te, uv_scale.mV[VX], uv_scale.mV[VY]); + object->setTEScale(te, uv_scale.mV[VX], uv_scale.mV[VY]); object->setTERotation(te, uv_rot); + LLPanelFace::LLSelectedTEMaterial::setNormalOffsetX(mPanel, uv_offset.mV[VX]); + LLPanelFace::LLSelectedTEMaterial::setNormalOffsetY(mPanel, uv_offset.mV[VY]); + LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetX(mPanel, uv_offset.mV[VX]); + LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetY(mPanel, uv_offset.mV[VY]); + LLPanelFace::LLSelectedTEMaterial::setNormalRotation(mPanel, uv_rot); + LLPanelFace::LLSelectedTEMaterial::setSpecularRotation(mPanel, uv_rot); } } if (!set_aligned) diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 7c084cb0ab..7820af8bcd 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -414,6 +414,7 @@ private: bool mUpdateInFlight; bool mUpdatePending; +public: #if defined(DEF_GET_MAT_STATE) #undef DEF_GET_MAT_STATE #endif |