X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=77da81ebec4a3e51d286dc5477142a46191c9cf0;hb=73567be7cd9e01e620cb2a8fa0ca381723b9a71f;hp=4414a90e6577910e7881dee65877134e7cd1ba69;hpb=fe9836f2d8d7abb0480582c544611a5b248310cc;p=libs%2Fgl.git

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 4414a90e..77da81eb 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -89,7 +89,6 @@ void Mesh::check_buffers(unsigned mask)
 			ibuf = new Buffer;
 			if(!batches.empty())
 				batches.front().change_buffer(ibuf);
-			vtx_setup.set_index_buffer(*ibuf);
 			dirty |= INDEX_BUFFER;
 
 #ifdef DEBUG
@@ -97,6 +96,9 @@ void Mesh::check_buffers(unsigned mask)
 				vbuf->set_debug_name(debug_name+" [IBO]");
 #endif
 		}
+
+		if(!batches.empty())
+			vtx_setup.set_index_buffer(*ibuf, batches.front().get_index_type());
 	}
 }
 
@@ -146,6 +148,19 @@ void Mesh::add_batch(const Batch &b)
 			batches.back().use_buffer(ibuf, prev);
 	}
 
+	DataType existing_type = batches.front().get_index_type();
+	DataType added_type = batches.back().get_index_type();
+	if(existing_type!=added_type)
+	{
+		if(get_type_size(existing_type)>get_type_size(added_type))
+			batches.back().set_index_type(existing_type);
+		else
+		{
+			for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
+				i->set_index_type(added_type);
+		}
+	}
+
 	check_buffers(INDEX_BUFFER);
 }