From abe5cc57873267724673c767ff3ec87016534a6c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 21 Apr 2020 10:32:45 +0300
Subject: [PATCH] Fix for 'release' configuration
llassert is not used in 'release' configuration and build fails due to unused tex_index
---
indra/llrender/llrender.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 4e7c71a374f..9b5231ad06a 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1540,7 +1540,7 @@ void LLRender::matrixMode(eMatrixMode mode)
U32 tex_index = gGL.getCurrentTexUnitIndex();
// the shaders don't actually reference anything beyond texture_matrix0/1 outside of terrain rendering
llassert(tex_index <= 3);
- mode = eMatrixMode(MM_TEXTURE0 + gGL.getCurrentTexUnitIndex());
+ mode = eMatrixMode(MM_TEXTURE0 + tex_index);
if (mode > MM_TEXTURE3)
{
// getCurrentTexUnitIndex() can go as high as 32 (LL_NUM_TEXTURE_LAYERS)
--
GitLab