X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.h;h=70370633fd0425cf88222ceab22b40d012604a35;hp=388d4d8806affd4d63901be8b7335a7bc7a85f55;hb=e37d3b91500994df3de4fe47bd3d3e75d3104b46;hpb=c51030d1cb2308d30db80303a561de1774dfdb76

diff --git a/source/mesh.h b/source/mesh.h
index 388d4d88..70370633 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -52,7 +52,7 @@ private:
 	};
 
 	VertexArray vertices;
-	std::list<Batch> batches;
+	std::vector<Batch> batches;
 	Buffer *vbuf;
 	Buffer *ibuf;
 	unsigned vao_id;
@@ -82,7 +82,7 @@ public:
 	float *modify_vertex(unsigned);
 
 	void add_batch(const Batch &b);
-	const std::list<Batch> &get_batches() { return batches; }
+	const std::vector<Batch> &get_batches() const { return batches; }
 
 	void set_winding(const WindingTest *);
 
@@ -95,7 +95,8 @@ public:
 
 	static void unbind();
 
-	virtual Resource::AsyncLoader *load(IO::Seekable &);
+	virtual int get_load_priority() const { return 1; }
+	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
 	virtual UInt64 get_data_size() const;
 	virtual void unload();
 };