diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-30 16:06:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-30 16:06:03 -0500 |
| commit | 4a6dde3b36c7a9bd7ed6602e291b8436fdbd4378 (patch) | |
| tree | f9054ad94014c54258c8758af6f79a10623fb852 | |
| parent | adcf2d98e39bc8cc4b480bcf8d88a037d9b4140d (diff) | |
NORSPEC-69 Fix for bump and specular map rotation values showing up as radians instead of degrees.
| -rw-r--r-- | 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 7b99d5897e..754a13dd4c 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1260,7 +1260,7 @@ void LLPanelFace::onMaterialLoaded(const LLMaterialID& material_id, const LLMate rot = material->getSpecularRotation(); getChild<LLUICtrl>("shinyScaleU")->setValue(repeat_x); getChild<LLUICtrl>("shinyScaleV")->setValue(repeat_y); - getChild<LLUICtrl>("shinyRot")->setValue(rot); + getChild<LLUICtrl>("shinyRot")->setValue(rot*RAD_TO_DEG); getChild<LLUICtrl>("shinyOffsetU")->setValue(offset_x); getChild<LLUICtrl>("shinyOffsetV")->setValue(offset_y); getChild<LLColorSwatchCtrl>("shinycolorswatch")->setOriginal(material->getSpecularLightColor()); @@ -1281,7 +1281,7 @@ void LLPanelFace::onMaterialLoaded(const LLMaterialID& material_id, const LLMate rot = material->getNormalRotation(); getChild<LLUICtrl>("bumpyScaleU")->setValue(repeat_x); getChild<LLUICtrl>("bumpyScaleV")->setValue(repeat_y); - getChild<LLUICtrl>("bumpyRot")->setValue(rot); + getChild<LLUICtrl>("bumpyRot")->setValue(rot*RAD_TO_DEG); getChild<LLUICtrl>("bumpyOffsetU")->setValue(offset_x); getChild<LLUICtrl>("bumpyOffsetV")->setValue(offset_y); } @@ -1333,7 +1333,7 @@ void LLPanelFace::updateMaterial() getChild<LLUICtrl>("bumpyOffsetV")->getValue().asReal()); mMaterial->setNormalRepeat(getChild<LLUICtrl>("bumpyScaleU")->getValue().asReal(), getChild<LLUICtrl>("bumpyScaleV")->getValue().asReal()); - mMaterial->setNormalRotation(getChild<LLUICtrl>("bumpyRot")->getValue().asReal()); + mMaterial->setNormalRotation(getChild<LLUICtrl>("bumpyRot")->getValue().asReal()*DEG_TO_RAD); } else { @@ -1351,7 +1351,7 @@ void LLPanelFace::updateMaterial() getChild<LLUICtrl>("shinyOffsetV")->getValue().asReal()); mMaterial->setSpecularRepeat(getChild<LLUICtrl>("shinyScaleU")->getValue().asReal(), getChild<LLUICtrl>("shinyScaleV")->getValue().asReal()); - mMaterial->setSpecularRotation(getChild<LLUICtrl>("shinyRot")->getValue().asReal()); + mMaterial->setSpecularRotation(getChild<LLUICtrl>("shinyRot")->getValue().asReal()*DEG_TO_RAD); } else { |