From 15b3c9f1643368fe0c5356ea11288525bbe9fbb3 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 13 Jun 2024 02:22:03 +0200
Subject: Fix a few merge issues

---
 indra/newview/lltinygltfhelper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lltinygltfhelper.cpp')

diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 7508956fd5..168708ca37 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -91,14 +91,14 @@ void LLTinyGLTFHelper::initFetchedTextures(tinygltf::Material& material,
         {
             if (material.pbrMetallicRoughness.metallicRoughnessTexture.index != material.occlusionTexture.index)
             {
-                LLImageDataLock lockIn(occlusion_img);
-                LLImageDataLock lockOut(mr_img);
                 // occlusion is a distinct texture from pbrMetallicRoughness
                 // pack into mr red channel
                 int occlusion_idx = material.occlusionTexture.index;
                 int mr_idx = material.pbrMetallicRoughness.metallicRoughnessTexture.index;
                 if (occlusion_idx != mr_idx)
                 {
+                    LLImageDataLock lockIn(occlusion_img);
+                    LLImageDataLock lockOut(mr_img);
                     //scale occlusion image to match resolution of mr image
                     occlusion_img->scale(mr_img->getWidth(), mr_img->getHeight());
 
-- 
cgit v1.3