diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-14 08:21:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-14 08:22:23 +0300 |
| commit | 904db487a7b14c31282fe0284612159a836657cd (patch) | |
| tree | 009890f584e830f13207972960455da28f4e7833 /source | |
| parent | 56021cad31c2cc17aa5abbbad1bf789563f530af (diff) | |
Fix T46284: Texture paint, wrong shading mode
Project-paint now supports painting to cycles materials.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index c40330a2f23..68e536662d6 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; |