From 8ce712f3ba80d2888b3bfb6d306b6c803c2e56bf Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 4 Oct 2023 15:22:31 +0800 Subject: GCC build fixes which includes another misleading indentation. --- indra/newview/CMakeLists.txt | 2 ++ indra/newview/llvovolume.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7847ccd574..28d08edec1 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1981,6 +1981,8 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized) set_source_files_properties(llinventorygallerymenu.cpp PROPERTIES COMPILE_FLAGS -Wno-uninitialized) + set_source_files_properties(llviewerstats.cpp PROPERTIES + COMPILE_FLAGS -Wno-unused-value) set_source_files_properties(llurl.cpp PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation) endif () diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c9f3d86793..0d8c2273b1 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5808,11 +5808,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) BOOL force_simple = (facep->getPixelArea() < FORCE_SIMPLE_RENDER_AREA); U32 type = gPipeline.getPoolTypeFromTE(te, tex); - if (is_pbr && gltf_mat && gltf_mat->mAlphaMode != LLGLTFMaterial::ALPHA_MODE_BLEND) - { - type = LLDrawPool::POOL_GLTF_PBR; - } - else + if (is_pbr && gltf_mat && gltf_mat->mAlphaMode != LLGLTFMaterial::ALPHA_MODE_BLEND) + { + type = LLDrawPool::POOL_GLTF_PBR; + } + else if (type != LLDrawPool::POOL_ALPHA && force_simple) { type = LLDrawPool::POOL_SIMPLE; -- cgit v1.2.3