[Bf-blender-cvs] [a5a58ec] blender-v2.76a-release: Fix T46284: Texture paint, wrong shading mode

[Campbell Barton]

Commit: a5a58ec140a5f31ced0cc3ba65299ecb01abc64f
Author: Campbell Barton
Date:   Wed Oct 14 16:21:01 2015 +1100
Branches: blender-v2.76a-release
https://developer.blender.org/rBa5a58ec140a5f31ced0cc3ba65299ecb01abc64f

Fix T46284: Texture paint, wrong shading mode

Project-paint now supports painting to cycles materials.

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

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..283dbc9 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1114,8 +1114,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 	/* if not cycles, or preview-modifiers, or drawing matcaps */
 	if ((draw_flags & DRAW_MODIFIERS_PREVIEW) ||
 	    (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) ||
-	    (BKE_scene_use_new_shading_nodes(scene) == false) ||
-	    ((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID)))
+	    (BKE_scene_use_new_shading_nodes(scene) == false))
 	{
 		draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags);
 		return;