X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;fp=source%2Frender%2Frenderer.cpp;h=98246da7fb6c7d42bd17dfc0c78f2ad3444b8dc3;hp=6bbfbbe0d0785628b89d1ec7c84608b2f0905b93;hb=d638587797a68e3095fb54cd2616f7b2f37a30ee;hpb=d841d557eec57575adc856a8b081042861dab9e8

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 6bbfbbe0..98246da7 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -25,7 +25,8 @@ const Tag Renderer::world_obj_matrix_tag("world_obj_matrix");
 const Tag Renderer::world_obj_normal_matrix_tag("world_obj_normal_matrix");
 
 Renderer::Renderer():
-	placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png"))
+	placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png")),
+	default_sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp"))
 {
 	state_stack.reserve(16);
 	shdata_stack.reserve(32);
@@ -171,7 +172,11 @@ void Renderer::set_texture(Tag tag, const Texture *tex, int level, const Sampler
 			res_mgr->resource_used(*tex);
 		if(!tex->is_loaded())
 			tex = &placeholder_texture;
+		if(!samp)
+			samp = &default_sampler;
 	}
+	else
+		samp = 0;
 
 	if(texture_stack.size()>state.texture_count)
 	{