summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-04-30 13:49:46 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-04-30 13:49:46 -0700
commit70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (patch)
treeacb5769be4572dd7fc26ec03eed97e03eb4fb4b5 /indra/newview/llviewerobject.cpp
parent806d09b1143894ad66cea2c228f467e8c39a8adf (diff)
Fix gcc ternary type inference fail to unbreak Mac and Linux builds
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 584c21cf45..fe43583271 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4093,7 +4093,12 @@ S32 LLViewerObject::setTENormalMapCore(const U8 te, LLViewerTexture *image)
uuid == LLUUID::null)
{
LLTextureEntry* tep = getTE(te);
- LLMaterial* mat = tep ? tep->getMaterialParams() : NULL;
+ LLMaterial* mat = NULL;
+ if (tep)
+ {
+ mat = tep->getMaterialParams();
+ }
+
if (mat)
{
mat->setNormalID(uuid);
@@ -4118,7 +4123,12 @@ S32 LLViewerObject::setTESpecularMapCore(const U8 te, LLViewerTexture *image)
uuid == LLUUID::null)
{
LLTextureEntry* tep = getTE(te);
- LLMaterial* mat = tep ? tep->getMaterialParams() : NULL;
+ LLMaterial* mat = NULL;
+ if (tep)
+ {
+ mat = tep->getMaterialParams();
+ }
+
if (mat)
{
mat->setSpecularID(uuid);