Commits

davep committed 8e0471e

MAINT-616 Fix for particles not rendering.

Comments (0)

Files changed (3)

indra/newview/lldrawpoolalpha.cpp

 
 				if ((params.mVertexBuffer->getTypeMask() & mask) != mask)
 				{ //FIXME!
-					//llwarns << "Missing required components, skipping render batch." << llendl;
+					llwarns << "Missing required components, skipping render batch." << llendl;
 					continue;
 				}
 

indra/newview/llvopartgroup.cpp

 	//indices and texcoords are always the same, set once
 	LLStrider<U16> indicesp;
 
+	LLStrider<LLVector4a> verticesp;
+
 	sVB->getIndexStrider(indicesp);
+	sVB->getVertexStrider(verticesp);
 
+	LLVector4a v;
+	v.set(0,0,0,0);
+
+	
 	U16 vert_offset = 0;
 
 	for (U32 i = 0; i < LL_MAX_PARTICLE_COUNT; i++)
 		*indicesp++ = vert_offset + 3;
 		*indicesp++ = vert_offset + 2;
 
+		*verticesp++ = v;
+
 		vert_offset += 4;
 	}
 

indra/newview/llvopartgroup.h

 
 	enum
 	{
-		VERTEX_DATA_MASK =	(1 << LLVertexBuffer::TYPE_VERTEX) |
-							(1 << LLVertexBuffer::TYPE_NORMAL) |
-							(1 << LLVertexBuffer::TYPE_TEXCOORD0) |
-							(1 << LLVertexBuffer::TYPE_COLOR)
+		VERTEX_DATA_MASK =	LLVertexBuffer::MAP_VERTEX |
+							LLVertexBuffer::MAP_NORMAL |
+							LLVertexBuffer::MAP_TEXCOORD0 |
+							LLVertexBuffer::MAP_COLOR |
+							LLVertexBuffer::MAP_TEXTURE_INDEX
 	};
 
 	LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);