X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=606dd341336fcbc8668bc8724e38898f9fe084bb;hp=af0d087398da9010816a0cce0f8bf563dc1f69d0;hb=ce657d3b7783db9f3450162fbf07210ea1c8c661;hpb=36ce025ec317bbe57719f94886d5d31932754d40

diff --git a/source/renderer.cpp b/source/renderer.cpp
index af0d0873..606dd341 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -90,9 +90,7 @@ void Renderer::set_lighting(const Lighting *l)
 	state->lighting = l;
 	state->lighting_matrix = mtx_stack.top();
 	if(l)
-		/* XXX I'm not happy with this, but can't come up with anything better
-		right now. */
-		const_cast<Lighting *>(l)->update_shader_data(mtx_stack.top());
+		l->update_shader_data(standard_shdata, mtx_stack.top());
 	lighting_changed = true;
 }
 
@@ -246,8 +244,6 @@ void Renderer::apply_state()
 					nm(i, j) = m(i, j);
 			nm = transpose(invert(nm));
 			standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0));
-			if(state->lighting)
-				state->lighting->get_shader_data().apply();
 			if(state->material)
 				state->material->get_shader_data().apply();
 			standard_shdata.apply();