diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-09-25 16:51:25 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-09-25 16:51:25 +0000 |
| commit | b5724bc0e97328a1859fc52b444e0a2edec255dd (patch) | |
| tree | f19d1df1b3d3baff6870e87040afbc0f2b738195 /indra/newview/llvovolume.cpp | |
| parent | af774fc9dbfd8550d61981b49151b60a7eaade91 (diff) | |
SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code.
Original patch was reviewed by merov (and others).
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 03709a14fb..93cb0f0f45 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -507,8 +507,8 @@ void LLVOVolume::updateTextures() if (face->mTextureMatrix != NULL) { - if (vsize < MIN_TEX_ANIM_SIZE && old_size > MIN_TEX_ANIM_SIZE || - vsize > MIN_TEX_ANIM_SIZE && old_size < MIN_TEX_ANIM_SIZE) + if ((vsize < MIN_TEX_ANIM_SIZE && old_size > MIN_TEX_ANIM_SIZE) || + (vsize > MIN_TEX_ANIM_SIZE && old_size < MIN_TEX_ANIM_SIZE)) { gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD, FALSE); } @@ -2601,7 +2601,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) { //needs normal + binormal bump_faces.push_back(facep); } - else if (te->getShiny() && LLPipeline::sRenderBump || + else if ((te->getShiny() && LLPipeline::sRenderBump) || !te->getFullbright()) { //needs normal simple_faces.push_back(facep); |