From 2c0cfd9185dda2fa33d2a7603d2959c827357aba Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 18 Jan 2018 18:34:08 +0200
Subject: [PATCH] MAINT-3859 Remade to account from smoothed looping
---
indra/newview/llviewertextureanim.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewertextureanim.cpp b/indra/newview/llviewertextureanim.cpp
index b94f6f4569f..96038110665 100644
--- a/indra/newview/llviewertextureanim.cpp
+++ b/indra/newview/llviewertextureanim.cpp
@@ -138,12 +138,16 @@ S32 LLViewerTextureAnim::animateTextures(F32 &off_s, F32 &off_t,
{
frame_counter = fmod(frame_counter, full_length);
}
-
- frame_counter = llmin(full_length - 1.f, frame_counter);
+ else
+ {
+ frame_counter = llmin(full_length - 1.f, frame_counter);
+ }
if (!(mMode & SMOOTH))
{
frame_counter = (F32)llfloor(frame_counter + 0.01f);
+ // account for 0.01, we shouldn't step over full length
+ frame_counter = llmin(full_length - 1.f, frame_counter);
}
if (mMode & PING_PONG)
--
GitLab