X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fprimitivebuilder.cpp;h=1b36943031e027b25e79a6df170535a905a281fa;hp=dd869908d9240df76b2f48a2308a0396613a35ad;hb=86721a55699193e63c76e8a0a7b0ced0416c1cce;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/builders/primitivebuilder.cpp b/source/builders/primitivebuilder.cpp
index dd869908..1b369430 100644
--- a/source/builders/primitivebuilder.cpp
+++ b/source/builders/primitivebuilder.cpp
@@ -59,12 +59,13 @@ PrimitiveType PrimitiveBuilder::get_type() const
 
 void PrimitiveBuilder::vertex_(const Vector4 &v)
 {
-	vab.color(col);
-	vab.normal(nor);
-	for(std::map<unsigned, Vector4>::iterator i=texc.begin(); i!=texc.end(); ++i)
-		vab.multitexcoord(i->first, i->second);
-	for(std::map<unsigned, Vector4>::iterator i=attr.begin(); i!=attr.end(); ++i)
-		vab.attrib(i->first, i->second);
+	const VertexFormat &format = array.get_format();
+	for(const unsigned char *a=format.begin(); a!=format.end(); ++a)
+	{
+		unsigned sem = get_attribute_semantic(*a);
+		if(sem<attr.size())
+			vab.attrib(sem, attr[sem]);
+	}
 	vab.vertex(v);
 
 	if(in_batch)