From e3d882b335cbc9aa4e64bf864e4fe08235117856 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 28 Oct 2015 12:36:25 +0200 Subject: [PATCH] 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. --- source/blender/editors/space_view3d/drawmesh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 68e536662d6..c40330a2f23 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;