Merge pull request #115 from secondlife/SL-19330

SL-19330: Fix texture animation in wrong direction when setting material on another side
meow-7.2.2
cosmic-linden 2023-03-09 13:44:21 -08:00 committed by GitHub
commit c90ffd84e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions

View File

@ -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