#5676 Expand PBR planar aligment to cover all channels

1 files changed, 39 insertions, 7 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 12e1ebaad6..26f1392758 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -854,24 +854,56 @@ struct LLPanelFaceSetAlignedTEFunctor : public LLSelectedTEFunctor
             }
 
             // Also align GLTF material if any
-            S32 gltf_info_index = 0; // base texture
+            LLGLTFMaterial::TextureInfo gltf_info_index = mPanel->getPBRTextureInfo();
             LLVector2 gltf_offset, gltf_scale;
             F32 gltf_rot;
-            if (facep->calcAlignedPlanarGLTF(mCenterFace, &gltf_offset, &gltf_scale, &gltf_rot, gltf_info_index))
+
+            if (gltf_info_index == LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT)
             {
+                // "Complete material" - update all texture transforms
                 LLGLTFMaterial new_override;
                 const LLTextureEntry* tep = object->getTE(te);
                 if (tep && tep->getGLTFMaterialOverride())
                 {
                     new_override = *tep->getGLTFMaterialOverride();
                 }
+                bool any_changed = false;
 
-                LLGLTFMaterial::TextureTransform& transform = new_override.mTextureTransform[gltf_info_index];
-                transform.mOffset.set(gltf_offset.mV[0], gltf_offset.mV[1]);
-                transform.mScale.set(gltf_scale.mV[0], gltf_scale.mV[1]);
-                transform.mRotation = gltf_rot;
+                for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                {
+                    if (facep->calcAlignedPlanarGLTF(mCenterFace, &gltf_offset, &gltf_scale, &gltf_rot, i))
+                    {
+                        LLGLTFMaterial::TextureTransform& transform = new_override.mTextureTransform[i];
+                        transform.mOffset.set(gltf_offset.mV[0], gltf_offset.mV[1]);
+                        transform.mScale.set(gltf_scale.mV[0], gltf_scale.mV[1]);
+                        transform.mRotation = gltf_rot;
+                        any_changed = true;
+                    }
+                }
 
-                LLGLTFMaterialList::queueModify(object, te, &new_override);
+                if (any_changed)
+                {
+                    LLGLTFMaterialList::queueModify(object, te, &new_override);
+                }
+            }
+            else
+            {
+                if (facep->calcAlignedPlanarGLTF(mCenterFace, &gltf_offset, &gltf_scale, &gltf_rot, gltf_info_index))
+                {
+                    LLGLTFMaterial new_override;
+                    const LLTextureEntry* tep = object->getTE(te);
+                    if (tep && tep->getGLTFMaterialOverride())
+                    {
+                        new_override = *tep->getGLTFMaterialOverride();
+                    }
+
+                    LLGLTFMaterial::TextureTransform& transform = new_override.mTextureTransform[gltf_info_index];
+                    transform.mOffset.set(gltf_offset.mV[0], gltf_offset.mV[1]);
+                    transform.mScale.set(gltf_scale.mV[0], gltf_scale.mV[1]);
+                    transform.mRotation = gltf_rot;
+
+                    LLGLTFMaterialList::queueModify(object, te, &new_override);
+                }
             }
         }
         if (!set_aligned)