X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=c3a6923f17338cb51d4221f02f6aa158e07fa0fe;hb=6dc2da27f0831d4172fcfeba4900616fd6c844b8;hp=c8972934cb304d34b22ed3a2f68147c7b7d74c48;hpb=6a045019fbd68738b77849629e6dfd3dfd9a4d93;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index c8972934..c3a6923f 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -33,6 +33,8 @@ Renderer::Renderer(const Camera *c):
 
 	if(c)
 		set_camera(*c);
+	else
+		standard_shdata.uniform("projection_matrix", Matrix());
 }
 
 Renderer::~Renderer()
@@ -169,7 +171,10 @@ void Renderer::pop_state()
 	bool camera_changed = (state->camera!=old_camera);
 	if(camera_changed)
 	{
-		standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+		if(state->camera)
+			standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+		else
+			standard_shdata.uniform("projection_matrix", Matrix());
 		changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
 	}
 	/* This actually should compare the relevant matrices rather than check for
@@ -325,13 +330,13 @@ void Renderer::apply_state()
 				changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
 			}
 
-			if(state->material && (changed&MATERIAL_SHDATA))
+			if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
 			{
 				state->material->get_shader_data().apply();
 				changed &= ~MATERIAL_SHDATA;
 			}
 
-			if(changed&STANDARD_SHDATA)
+			if((changed&STANDARD_SHDATA) || shprog_changed)
 			{
 				standard_shdata.apply();
 				changed &= ~STANDARD_SHDATA;