summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorcosmic-linden <111533034+cosmic-linden@users.noreply.github.com>2023-03-09 13:44:21 -0800
committerGitHub <noreply@github.com>2023-03-09 13:44:21 -0800
commitc90ffd84e0ebf788c2c67cc36c89757c6cbd2025 (patch)
tree55e404a5da242a03d7f0ceb93b4fb292a9118a86 /indra/newview
parent117f97571867130f2c8131301d02e8f7c2f1e51c (diff)
parent65fe41eb6e0df6029e9187a26e1aee5f27fa70d6 (diff)
Merge pull request #115 from secondlife/SL-19330
SL-19330: Fix texture animation in wrong direction when setting material on another side
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvovolume.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 853c580964..e69dea3444 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -670,6 +670,21 @@ void LLVOVolume::animateTextures()
}
else
{
+ if (!(result & LLViewerTextureAnim::ROTATE))
+ {
+ rot = 0.0f;
+ }
+ if (!(result & LLViewerTextureAnim::TRANSLATE))
+ {
+ off_s = 0.0f;
+ off_t = 0.0f;
+ }
+ if (!(result & LLViewerTextureAnim::SCALE))
+ {
+ scale_s = 1.0f;
+ scale_t = 1.0f;
+ }
+
// For PBR materials, use Blinn-Phong rotation as hint for
// translation direction. In a Blinn-Phong material, the
// translation direction would be a byproduct the texture