X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.cpp;h=347e42595a1387bf7630a87344a6dc96f7425ac3;hb=dff7004fa078d55911664c0f513b5dc6c9449420;hp=67a90ef7e2ea6810de672903d64a44674d35fe67;hpb=e1d07383b29e8581230b50f45606192d1f21f5dd;p=libs%2Fgl.git

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index 67a90ef7..347e4259 100644
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -74,8 +74,6 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("generic", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::generic));
 	add("generic", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::generic));
 	add("generic", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::generic));
-	add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
-	add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
 	add("group", static_cast<void (Loader::*)(int)>(&Loader::group));
 	add("group", static_cast<void (Loader::*)(int, int)>(&Loader::group));
 	add("group", static_cast<void (Loader::*)(int, int, int)>(&Loader::group));
@@ -85,6 +83,7 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("weight", static_cast<void (Loader::*)(float, float, float)>(&Loader::weight));
 	add("weight", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::weight));
 
+	// Deprecated
 	add("vertex2",   static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
 	add("vertex3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
 	add("vertex4",   static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
@@ -103,8 +102,13 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("generic2",  static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::generic));
 	add("generic3",  static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::generic));
 	add("generic4",  static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::generic));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	add("tangent3",  static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
 	add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+	add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+	add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+#pragma GCC diagnostic pop
 }
 
 } // namespace GL