bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix provided by Mal:

Browse Source 
- 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
This commit is contained in:
Ton Roosendaal 2007-05-20 15:55:49 +00:00
parent 8fac5a9aa1
commit fbbc038cb6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/drawmesh.c
View File

@ -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");

2
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
View File

@ -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);
}