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

diff --git a/source/builders/primitivebuilder.cpp b/source/builders/primitivebuilder.cpp
index dd869908..85c695c3 100644
--- a/source/builders/primitivebuilder.cpp
+++ b/source/builders/primitivebuilder.cpp
@@ -59,12 +59,12 @@ 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);
+	for(VertexAttribute a: array.get_format())
+	{
+		unsigned sem = get_attribute_semantic(a);
+		if(sem<attr.size())
+			vab.attrib(sem, attr[sem]);
+	}
 	vab.vertex(v);
 
 	if(in_batch)