X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmesh.cpp;fp=source%2Fmesh.cpp;h=8f7911219ec68afa3cb9048d35960bef3462437c;hb=76ca3c65dbb96461e42300016a85a4e158f5596b;hp=b5535039b44109a2f31ca8cd9c57105001966b64;hpb=9be04243c92f024327e74ad8d48861581d83b7ed;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index b5535039..8f791121 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -79,33 +79,35 @@ void Mesh::add_batch(const Batch &b)
 {
 	create_buffers();
 
-	if(!batches.empty() && batches.back().can_append(b.get_type()))
+	if(batches.empty())
+	{
+		batches.push_back(b);
+		batches.back().use_buffer(ibuf);
+	}
+	else if(batches.back().can_append(b.get_type()))
 		batches.back().append(b);
 	else
 	{
 		bool reallocate = (batches.size()==batches.capacity());
-		if(reallocate && ibuf)
+		if(reallocate)
 		{
 			for(vector<Batch>::iterator i=batches.end(); i!=batches.begin(); )
 				(--i)->use_buffer(0);
 		}
 
-		Batch *prev = (batches.empty() ? 0 : &batches.back());
+		Batch *prev = &batches.back();
 		batches.push_back(b);
-		if(ibuf)
+		if(reallocate)
 		{
-			if(reallocate)
+			prev = 0;
+			for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
 			{
-				prev = 0;
-				for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
-				{
-					i->use_buffer(ibuf, prev);
-					prev = &*i;
-				}
+				i->use_buffer(ibuf, prev);
+				prev = &*i;
 			}
-			else
-				batches.back().use_buffer(ibuf, prev);
 		}
+		else
+			batches.back().use_buffer(ibuf, prev);
 	}
 }