From 42bf6d155e19236dc91bf492bb9ea6cb56e2f397 Mon Sep 17 00:00:00 2001 From: minerjr Date: Fri, 15 Aug 2025 19:54:21 -0300 Subject: [PATCH] Revert "Fix RelWithDebug compile issue in gltf\asset.cpp" This reverts commit 0898e6dbb8232eb23c9884a2780892b65b271764. --- indra/newview/gltf/asset.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp index e6dd9c1749..b9a8879fb1 100644 --- a/indra/newview/gltf/asset.cpp +++ b/indra/newview/gltf/asset.cpp @@ -589,7 +589,7 @@ bool Asset::prep() for (U32 variant = 0; variant < LLGLSLShader::NUM_GLTF_VARIANTS; ++variant) { -#ifdef SHOW_ASSERT +#if SHOW_ASSERT U32 attribute_mask = 0; #endif // for each mesh @@ -606,10 +606,10 @@ bool Asset::prep() vertex_count[variant] += primitive.getVertexCount(); index_count[variant] += primitive.getIndexCount(); -#ifdef SHOW_ASSERT + // all primitives of a given variant and material should all have the same attribute mask llassert(attribute_mask == 0 || primitive.mAttributeMask == attribute_mask); - +#if SHOW_ASSERT attribute_mask |= primitive.mAttributeMask; #endif }