summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSimon Linden <simon@lindenlab.com>2013-06-06 18:16:44 -0700
committerSimon Linden <simon@lindenlab.com>2013-06-06 18:16:44 -0700
commit8511385a5407181ced7bb226d4054185c597d05e (patch)
treeffde158103d74bb73518203909c8748b15af0954 /indra/newview
parent8420e8d5db1b9987f57fa542d81e450f54aec16f (diff)
MAINT-2764 : Planar texture mapping with bumpiness and path cut breaks under
forward rendering. Will get Dave P to review
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvovolume.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 00a109546e..98943b194e 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4268,8 +4268,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
U32 bump_count = 0;
U32 simple_count = 0;
U32 alpha_count = 0;
-
-
U32 useage = group->mSpatialPartition->mBufferUsage;
@@ -4709,15 +4707,15 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
bump_mask |= LLVertexBuffer::MAP_BINORMAL;
genDrawInfo(group, simple_mask | LLVertexBuffer::MAP_TEXTURE_INDEX, simple_faces, simple_count, FALSE, TRUE);
genDrawInfo(group, fullbright_mask | LLVertexBuffer::MAP_TEXTURE_INDEX, fullbright_faces, fullbright_count, FALSE, TRUE);
- genDrawInfo(group, bump_mask | LLVertexBuffer::MAP_TEXTURE_INDEX, bump_faces, bump_count, FALSE, FALSE);
+ genDrawInfo(group, bump_mask | LLVertexBuffer::MAP_TEXTURE_INDEX, bump_faces, bump_count, FALSE, TRUE);
genDrawInfo(group, alpha_mask | LLVertexBuffer::MAP_TEXTURE_INDEX, alpha_faces, alpha_count, TRUE, TRUE);
}
else
{
- genDrawInfo(group, simple_mask, simple_faces, simple_count);
- genDrawInfo(group, fullbright_mask, fullbright_faces, fullbright_count);
+ genDrawInfo(group, simple_mask, simple_faces, simple_count, FALSE, FALSE);
+ genDrawInfo(group, fullbright_mask, fullbright_faces, fullbright_count, FALSE, FALSE);
genDrawInfo(group, bump_mask, bump_faces, bump_count, FALSE, FALSE);
- genDrawInfo(group, alpha_mask, alpha_faces, alpha_count, TRUE);
+ genDrawInfo(group, alpha_mask, alpha_faces, alpha_count, TRUE, FALSE);
}