Merge pull request #1746 from Ansariel/develop

Fix a few merge issues

1 files changed, 2 insertions, 2 deletions

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());