X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frender%2Fzsortedscene.cpp;fp=source%2Frender%2Fzsortedscene.cpp;h=af3c5b86140823968a12cc19cf36a747fe3b5c1c;hb=84e0e55710123e54617d342df852007f8b60af24;hp=dd5f1f3ac701f727cd81b67b44f153eaa99d6282;hpb=0fa506250545acb83bc86f1734826544d6f1eda6;p=libs%2Fgl.git

diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index dd5f1f3a..af3c5b86 100644
--- a/source/render/zsortedscene.cpp
+++ b/source/render/zsortedscene.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "camera.h"
 #include "renderer.h"
 #include "zsortedscene.h"
@@ -9,14 +10,23 @@ namespace GL {
 
 void ZSortedScene::add(Renderable &r)
 {
-	if(renderables.insert(&r).second && !sorted_cache.empty())
-		sorted_cache.push_back(&r);
+	auto i = lower_bound(renderables, &r);
+	if(i==renderables.end() || *i!=&r)
+	{
+		renderables.insert(i, &r);
+		if(!sorted_cache.empty())
+			sorted_cache.push_back(&r);
+	}
 }
 
 void ZSortedScene::remove(Renderable &r)
 {
-	renderables.erase(&r);
-	sorted_cache.clear();
+	auto i = lower_bound(renderables, &r);
+	if(i!=renderables.end() && *i==&r)
+	{
+		renderables.erase(i);
+		sorted_cache.clear();
+	}
 }
 
 void ZSortedScene::set_order(SortOrder o)