[Bf-blender-cvs] [1823e56] blender-v2.76-release: Follow up to previous commit, proper fix for T46284, incorrect Texture shading in Texture paint mode and cycles

[Antony Riakiotakis]

Commit: 1823e5662543c07292712de0cf781b34eb109ac3
Author: Antony Riakiotakis
Date:   Wed Oct 28 12:51:50 2015 +0200
Branches: blender-v2.76-release
https://developer.blender.org/rB1823e5662543c07292712de0cf781b34eb109ac3

Follow up to previous commit, proper fix for T46284, incorrect Texture
shading in Texture paint mode and cycles

===================================================================

M       source/blender/editors/space_view3d/drawmesh.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawmesh.c 
b/source/blender/editors/space_view3d/drawmesh.c
index d806dfa..c802971 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -410,7 +410,8 @@ static void draw_textured_begin(Scene *scene, View3D *v3d, 
RegionView3D *rv3d, O
                solidtex = false;
                Gtexdraw.is_lit = 0;
        }
-       else if (v3d->drawtype == OB_SOLID || ((ob->mode & OB_MODE_EDIT) && 
v3d->drawtype != OB_TEXTURE)) {
+       else if (v3d->drawtype == OB_SOLID || ((ob->mode & OB_MODE_EDIT) && 
v3d->drawtype != OB_TEXTURE) ||
+               (BKE_scene_use_new_shading_nodes(scene) && (ob->mode & 
OB_MODE_TEXTURE_PAINT))) {
                /* draw with default lights in solid draw mode and edit mode */
                solidtex = true;
                Gtexdraw.is_lit = -1;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs