[Bf-blender-cvs] [25beefa] blender-v2.76-release: Revert "Fix T46284: Texture paint, wrong shading mode"

Antony Riakiotakis noreply at git.blender.org
Thu Oct 29 12:08:11 CET 2015


Commit: 25beefa8dd2d0bc359936f94e2260614e9b63f86
Author: Antony Riakiotakis
Date:   Wed Oct 28 12:36:25 2015 +0200
Branches: blender-v2.76-release
https://developer.blender.org/rB25beefa8dd2d0bc359936f94e2260614e9b63f86

Revert "Fix T46284: Texture paint, wrong shading mode"

Should fix T46616 but will reintroduce T46284.
The second, original bug needs different handling

This reverts commit 904db487a7b14c31282fe0284612159a836657cd.

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

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 283dbc9..d806dfa 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1114,7 +1114,8 @@ 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))
+	    (BKE_scene_use_new_shading_nodes(scene) == false) ||
+	    ((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID)))
 	{
 		draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags);
 		return;




More information about the Bf-blender-cvs mailing list