summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-05-01 14:37:50 -0500
committerGitHub <noreply@github.com>2024-05-01 14:37:50 -0500
commit812e2cda54f14a1a6854dd7b9fdd2951932ba2fa (patch)
tree944aabe74faec1466917fa9ce4bcae3e4aeb526a /indra/newview
parent9b6979f458b585618fa59887b500a1a7a4a6e02f (diff)
#1382 Fix for scrubbing occlusion channel of ORM map (#1383)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltinygltfhelper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 49c35165e6..4e41f9959a 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -104,9 +104,9 @@ void LLTinyGLTFHelper::initFetchedTextures(tinygltf::Material& material,
}
}
}
- else
+ else if (material.occlusionTexture.index == -1)
{
- // no occlusion, make a white occlusion image
+ // no occlusion, make sure red channel of ORM is all 255
occlusion_img = new LLImageRaw(mr_img->getWidth(), mr_img->getHeight(), 3);
occlusion_img->clear(255, 255, 255);
copy_red_channel(occlusion_img, mr_img);