Add static Texture::unbind_from function

[libs/gl.git] / source / primitivebuilder.cpp

diff --git a/source/primitivebuilder.cpp b/source/primitivebuilder.cpp
index 6a4d9bf0b866ccd1585a68ef05acf9b1c42df682..95faa3fb5f74aee13e63f392bda69e4871d700e5 100644 (file)
--- a/source/primitivebuilder.cpp
+++ b/source/primitivebuilder.cpp
@@ -55,9 +55,11 @@ PrimitiveType PrimitiveBuilder::get_type() const
 
 void PrimitiveBuilder::vertex_(float x, float y, float z, float w)
 {
-       vab.texcoord(ts, tt, tr,tq);
+       vab.texcoord(ts, tt, tr, tq);
        vab.color(cr, cg, cb, ca);
        vab.normal(nx, ny, nz);
+       for(std::map<unsigned, Attrib>::iterator i=av.begin(); i!=av.end(); ++i)
+               vab.attrib(i->first, i->second.x, i->second.y, i->second.z, i->second.w);
        vab.vertex(x, y, z, w);
 
        if(in_batch)