X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=2ca040e6feb68e3eb65239a4c05e4eadfd997053;hp=d43e0d0efdd421b43b209c0e8f4f280d2529c895;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hpb=56c9bfa0b47583fb9067705a69c3639a17d4a097

diff --git a/source/mesh.cpp b/source/mesh.cpp
index d43e0d0e..2ca040e6 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -99,7 +99,7 @@ void Mesh::update_index_buffer()
 
 
 Mesh::Loader::Loader(Mesh &m):
-	mesh(m)
+	DataFile::ObjectLoader<Mesh>(m)
 {
 	add("vertices", &Loader::vertices);
 	add("batch",    &Loader::batch);
@@ -107,14 +107,14 @@ Mesh::Loader::Loader(Mesh &m):
 
 void Mesh::Loader::vertices(VertexFormat f)
 {
-	mesh.vertices.reset(f);
-	load_sub(mesh.vertices);
+	obj.vertices.reset(f);
+	load_sub(obj.vertices);
 }
 
 void Mesh::Loader::batch(PrimitiveType p)
 {
-	mesh.batches.push_back(Batch(p));
-	load_sub(mesh.batches.back());
+	obj.batches.push_back(Batch(p));
+	load_sub(obj.batches.back());
 }
 
 } // namespace GL