From 5d62cdbcb2b7584cfa23b25c75155cdb0787d381 Mon Sep 17 00:00:00 2001
From: cosmic-linden <111533034+cosmic-linden@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:28:13 -0700
Subject: secondlife/viewer#2768: Partial fix for PBR texture animations
 stopping. May also fix some Blinn-Phong texture animations. (#2971)

---
 indra/newview/llvovolume.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 253fb01219..719913a591 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -784,7 +784,24 @@ void LLVOVolume::updateTextureVirtualSize(bool forced)
         LLFace* face = mDrawable->getFace(i);
         if (!face) continue;
         const LLTextureEntry *te = face->getTextureEntry();
-        LLViewerTexture *imagep = face->getTexture();
+        LLViewerTexture *imagep = nullptr;
+        U32 ch_min;
+        U32 ch_max;
+        if (!te->getGLTFRenderMaterial())
+        {
+            ch_min = LLRender::DIFFUSE_MAP;
+            ch_max = LLRender::SPECULAR_MAP;
+        }
+        else
+        {
+            ch_min = LLRender::BASECOLOR_MAP;
+            ch_max = LLRender::EMISSIVE_MAP;
+        }
+        for (U32 ch = ch_min; (!imagep && ch <= ch_max); ++ch)
+        {
+            // Get _a_ non-null texture if possible (usually diffuse/basecolor, but could be something else)
+            imagep = face->getTexture(ch);
+        }
         if (!imagep || !te ||
             face->mExtents[0].equals3(face->mExtents[1]))
         {
-- 
cgit v1.2.3