Fix T46284: Texture paint, wrong shading mode

Project-paint now supports painting to cycles materials.
This commit is contained in:
Campbell Barton 2015-10-14 16:21:01 +11:00
parent 56021cad31
commit 904db487a7
Notes: blender-bot 2023-02-14 08:36:55 +01:00
Referenced by commit e3d882b335, Revert "Fix T46284: Texture paint, wrong shading mode"
Referenced by issue #46284, Incorrect Texture shading in Texture paint mode
1 changed files with 1 additions and 2 deletions

View File

@ -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;