diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-28 20:32:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-13 18:47:11 +0400 |
| commit | 477f35559cf20ea6cc81fa3d3a0ec1b886dbf5e4 (patch) | |
| tree | 5d7b88fc9cac1bc5d2a11bd8146117ff50da863d /source/blender/editors/space_view3d/drawmesh.c | |
| parent | b72eca435ebdbd10359b7c0fc67cb9eddc1b2dcf (diff) | |
Code cleanup: reorder BKE_scene_use_new_shading_nodes checks last
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 03f2fa86ecb..56b6b6a89a7 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -947,7 +947,10 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, const int draw_flags) { /* if not cycles, or preview-modifiers, or drawing matcaps */ - if ((!BKE_scene_use_new_shading_nodes(scene)) || (draw_flags & DRAW_MODIFIERS_PREVIEW) || (v3d->flag2 & V3D_SHOW_SOLID_MATCAP)) { + if ((draw_flags & DRAW_MODIFIERS_PREVIEW) || + (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) || + (BKE_scene_use_new_shading_nodes(scene) == false)) + { draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags); return; } |