X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.cpp;h=1b0c47bf976dd212aa4270a962d7f98a40f34761;hb=98cc25ffe956bc162c053c96df659ba40dfe2d6e;hp=34bd83c0d7ac07683bc3bea118c9d33a46f3e012;hpb=a86623004ba91baef76dac9275e9b79366acce16;p=libs%2Fgl.git

diff --git a/source/batch.cpp b/source/batch.cpp
index 34bd83c0..1b0c47bf 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -4,6 +4,7 @@
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
+#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -195,11 +196,6 @@ void Batch::append_index(unsigned i)
 		data.push_back(i);
 }
 
-void Batch::upload_data() const
-{
-	get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
-}
-
 unsigned Batch::get_index_size() const
 {
 	if(data_type==UNSIGNED_SHORT)
@@ -245,14 +241,13 @@ void Batch::draw() const
 		restart_index = 0;
 	}
 
-	if(get_buffer())
+	Buffer *ibuf = get_buffer();
+	BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+	if(ibuf)
 	{
 		if(dirty)
 			update_buffer();
 
-		BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
-		Bind bind_ibuf(alias, true);
-
 		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
 	}
 	else