From 2c31cc45d4e41c42a8940bdefb79eae9d85d8fd7 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 19 Jul 2023 13:04:12 +0800 Subject: Pass texture entry pointer instead to copyTexture Otherwise on GCC the -Waddress & -Wno-nonnull-compare warnings would be treated as errors. It's a different term on Clang, which is undefined bool conversion. On Clang it's just a warning, but on AppleClang it's treated as an error. Rather than suppressing these warnings, I think it's better to just adjust the interface of copyTexture, since it isn't called that many times. --- indra/llprimitive/llprimitive.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llprimitive/llprimitive.cpp') diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 67c225d25d..6ee438d181 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -263,7 +263,7 @@ void LLPrimitive::setAllTETextures(const LLUUID &tex_id) //=============================================================== void LLPrimitive::setTE(const U8 index, const LLTextureEntry& te) { - if(mTextureList.copyTexture(index, te) != TEM_CHANGE_NONE && te.getBumpmap() > 0) + if(mTextureList.copyTexture(index, &te) != TEM_CHANGE_NONE && te.getBumpmap() > 0) { mNumBumpmapTEs++; } @@ -742,7 +742,7 @@ void LLPrimitive::copyTEs(const LLPrimitive *primitivep) } for (i = 0; i < num_tes; i++) { - mTextureList.copyTexture(i, *(primitivep->getTE(i))); + mTextureList.copyTexture(i, primitivep->getTE(i)); } } -- cgit v1.2.3