Code cleanup: reorder BKE_scene_use_new_shading_nodes checks last
[blender.git] / source / blender / editors / space_view3d / drawmesh.c
index 03f2fa86ecb1930d27028e6b92c172ccdb3add93..56b6b6a89a73b479e2215a10d8b95cfe42e46199 100644 (file)
@@ -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;
        }