From 043beaf7ee06fca09b315ff771a7d9a7dd5ed506 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 27 Feb 2012 22:16:13 +0100
Subject: [PATCH] FS-5132; only use color strider if face has colors.

---
 indra/newview/llface.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 01e45d5cc4..3a82f25d37 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1840,7 +1840,10 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		}
 	}
 
-	if (rebuild_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);
 		mVertexBuffer->getColorStrider(colors, mGeomIndex, mGeomCount, map_range);