Fix provided by Mal:

- 3D Window, textured drawmode shows lighted again for non-textured faces
- Engine: faces show lighted again when 3d windows was Solid draw mode

Example:
http://www.candointeractive.com/blender/BlenderViewport.jpg

2 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c
index d558a001f2e..9fa5068410b 100644
--- a/source/blender/src/drawmesh.c
+++ b/source/blender/src/drawmesh.c
@@ -1021,7 +1021,7 @@ void draw_tface_mesh(Object *ob, Mesh *me, int dt)
 	g_draw_tface_mesh_ob = ob;
 	g_draw_tface_mesh_istex = istex;
 	memcpy(g_draw_tface_mesh_obcol, obcol, sizeof(obcol));
-	set_draw_settings_cached(1, 0, 0, 0, 0, 0, 0);
+	set_draw_settings_cached(1, 0, 0, 1, 0, 0, 0);
 
 	if(dt > OB_SOLID || g_draw_tface_mesh_islight==-1) {
 		bProperty *prop = get_property(ob, "Text");
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index ef89477c345..689772f51c4 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -181,7 +181,7 @@ bool RAS_MaterialBucket::ActivateMaterial(const MT_Transform& cameratrans, RAS_I
 	else
 		dolights = (m_material->GetDrawingMode()&16)!=0;
 
-	if ((rasty->GetDrawingMode() <= RAS_IRasterizer::KX_SOLID) || !dolights)
+	if ((rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID) || !dolights)
 	{
 		rendertools->ProcessLighting(-1);
 	}