diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-10-28 13:51:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-29 13:10:17 +0300 |
| commit | 1823e5662543c07292712de0cf781b34eb109ac3 (patch) | |
| tree | c98f4ed2223067d54a58eeb8de686b6d48ce2688 | |
| parent | 25beefa8dd2d0bc359936f94e2260614e9b63f86 (diff) | |
Follow up to previous commit, proper fix for T46284, incorrect Texture
shading in Texture paint mode and cycles
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index d806dfa015a..c802971484e 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -410,7 +410,8 @@ static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, O solidtex = false; Gtexdraw.is_lit = 0; } - else if (v3d->drawtype == OB_SOLID || ((ob->mode & OB_MODE_EDIT) && v3d->drawtype != OB_TEXTURE)) { + else if (v3d->drawtype == OB_SOLID || ((ob->mode & OB_MODE_EDIT) && v3d->drawtype != OB_TEXTURE) || + (BKE_scene_use_new_shading_nodes(scene) && (ob->mode & OB_MODE_TEXTURE_PAINT))) { /* draw with default lights in solid draw mode and edit mode */ solidtex = true; Gtexdraw.is_lit = -1; |