X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=b935ce14c3e88bf94636135cc5ae0fe084574cbf;hb=9e63512930bc7dace6dc169c65161961e5dcfcf6;hp=8a2833b8b55b5551a5ae992d7cd8a22ef0108299;hpb=0fa506250545acb83bc86f1734826544d6f1eda6;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 8a2833b8..b935ce14 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -303,11 +303,13 @@ void Renderer::apply_state()
 		flush_textures();
 
 	for(const BoundTexture &t: texture_stack)
-	{
-		int unit = (t.tag.id ? state->shprog->get_uniform_binding(t.tag) : t.unit);
-		if(unit>=0)
-			pipeline_state.set_texture(unit, t.texture, t.sampler);
-	}
+		if(t.texture && t.replaced<0)
+		{
+			if(t.binding<0 || shprog_changed)
+				t.binding = state->shprog->get_uniform_binding(t.tag);
+			if(t.binding>=0)
+				pipeline_state.set_texture(t.binding, t.texture, t.sampler);
+		}
 
 	bool shdata_changed = changed&SHADER_DATA;
 	for(auto i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i)