V3 merge part 1 / 2.

This commit is contained in:
Shyotl
2012-04-13 22:39:39 -05:00
parent 3bd9ffe135
commit e1d243272f
34 changed files with 879 additions and 780 deletions

View File

@@ -1740,9 +1740,9 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
}
}
// <FS:ND> FS-5132 Only use color strider if face has colors.
// if (rebuild_color)
if (rebuild_color && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_COLOR) )
// <FS:ND> FS-5132 Only use color strider if face has colors.
// if (rebuild_color)
if (rebuild_color && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_COLOR) )
// </FS:ND>
{
LLFastTimer t(FTM_FACE_GEOM_COLOR);