summaryrefslogtreecommitdiff
path: root/indra/newview/lltinygltfhelper.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 00:14:56 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 00:14:56 +0200
commit78174fc8658caeddfd8306ec19eb0e1c2975368e (patch)
tree0948d578f384fbd247eefd2dff771a9cd8cbd8c1 /indra/newview/lltinygltfhelper.cpp
parent689ef9442581d7af8ff0e0264be4919fe6cffd73 (diff)
parent9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff)
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts: # .github/workflows/build.yaml
Diffstat (limited to 'indra/newview/lltinygltfhelper.cpp')
-rw-r--r--indra/newview/lltinygltfhelper.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 999be07dba..5b75db37d0 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -178,6 +178,7 @@ LLImageRaw * LLTinyGLTFHelper::getTexture(const std::string & folder, const tiny
{
rawImage = new LLImageRaw(&image->image[0], image->width, image->height, image->component);
rawImage->verticalFlip();
+ rawImage->optimizeAwayAlpha();
}
return rawImage;