[Bf-blender-cvs] [fd8c3fe] master: Follow up to previous commit, proper fix for T46284, incorrect Texture shading in Texture paint mode and cycles

[Antony Riakiotakis]

Commit: fd8c3fe07023674ba60ba3c8412536f0ae1a984b
Author: Antony Riakiotakis
Date:   Wed Oct 28 12:51:50 2015 +0200
Branches: master
https://developer.blender.org/rBfd8c3fe07023674ba60ba3c8412536f0ae1a984b

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 c40330a..6210d05 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;