Use the same index type for all of a Mesh's batches

[libs/gl.git] / source / core / batch.cpp

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 2bc44c9ddfe285c1dac5afa2fb2cd28ef63fba16..ebd7b049125137d2fb89f9d40255d44a139f5b8c 100644 (file)
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -1,7 +1,6 @@
 #include <msp/gl/extensions/arb_draw_instanced.h>
 #include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
-#include "bindable.h"
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
@@ -66,6 +65,8 @@ Batch::~Batch()
 
 void Batch::set_index_type(DataType t)
 {
+       if(t==index_type)
+               return;
        if(t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
                throw invalid_argument("Batch::set_data_type");
        if(t==UNSIGNED_SHORT && max_index>0xFFFE)