X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexformat.h;h=e3c1205058fe3e889e6deea55d2d401c42ab7f24;hb=73590a7fcd931261d2b9c26fd3a0e53a37aa6e2c;hp=0dbde9f9a9be825247a366cb2246fae612d8c1b3;hpb=e1d07383b29e8581230b50f45606192d1f21f5dd;p=libs%2Fgl.git

diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h
index 0dbde9f9..e3c12050 100644
--- a/source/core/vertexformat.h
+++ b/source/core/vertexformat.h
@@ -26,20 +26,19 @@ enum VertexAttribute
 	COLOR4_FLOAT,
 	NORMAL3 = 18,
 	TANGENT3 = 26,
-	BINORMAL3 = 34,
-	GROUP1 = 40,
+	GROUP1 = 32,
 	GROUP2,
 	GROUP3,
 	GROUP4,
-	WEIGHT1 = 48,
+	WEIGHT1 = 40,
 	WEIGHT2,
 	WEIGHT3,
 	WEIGHT4,
-	TEXCOORD1 = 56,
+	TEXCOORD1 = 48,
 	TEXCOORD2,
 	TEXCOORD3,
 	TEXCOORD4,
-	GENERIC1 = 88,
+	GENERIC1 = 80,
 	GENERIC2,
 	GENERIC3,
 	GENERIC4,
@@ -78,11 +77,11 @@ public:
 inline VertexFormat operator,(VertexAttribute a1, VertexAttribute a2)
 { return (VertexFormat(a1), a2); }
 
-inline VertexFormat operator,(VertexAttribute a, unsigned i)
-{ return (VertexFormat(a), i); }
-
 VertexAttribute make_indexed_attribute(VertexAttribute, unsigned);
 
+inline VertexAttribute operator,(VertexAttribute a, unsigned i)
+{ return make_indexed_attribute(a, i); }
+
 DEPRECATED inline VertexAttribute make_indexed_component(VertexAttribute a, unsigned i)
 { return make_indexed_attribute(a, i); }