[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10742] trunk/blender/source: Fix provided by Mal:

[Ton Roosendaal]

Revision: 10742
          https://svn.blender.org//revision/?rev=10742&view=rev
Author:   ton
Date:     2007-05-20 17:55:49 +0200 (Sun, 20 May 2007)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawmesh.c
    trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp

Modified: trunk/blender/source/blender/src/drawmesh.c
===================================================================
--- trunk/blender/source/blender/src/drawmesh.c	2007-05-20 15:52:29 UTC (rev 10741)
+++ trunk/blender/source/blender/src/drawmesh.c	2007-05-20 15:55:49 UTC (rev 10742)
@@ -1021,7 +1021,7 @@
 	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");

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp	2007-05-20 15:52:29 UTC (rev 10741)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp	2007-05-20 15:55:49 UTC (rev 10742)
@@ -181,7 +181,7 @@
 	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);
 	}