GRIM, SHADERS: Toggle light inside drawMesh.

Fixes appearance of roulettes in cn and beavers in dm (residualvm#1186).
vpelletier · Jul 9, 2016 · 52d3bdb · 52d3bdb
1 parent 0d10131
commit 52d3bdb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
@@ -975,6 +975,7 @@ void GfxOpenGLS::drawMesh(const Mesh *mesh) {
 
 	actorShader->use();
 	actorShader->setUniform("extraMatrix", _matrixStack.top());
+	actorShader->setUniform("lightsEnabled", _lightsEnabled);
 
 	const Material *curMaterial = NULL;
 	for (int i = 0; i < mesh->_numFaces;) {

diff --git a/engines/grim/shaders/grim_actor.vertex b/engines/grim/shaders/grim_actor.vertex
@@ -93,5 +93,7 @@ void main()
 			light += lights[i]._color.xyz * intensity;
 		}
 		Color = clamp(vec4(color.xyz * light, color.w), 0.0, 1.0);
+	} else {
+		Color = color;
 	}
 }