Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_node / node_templates.c
index 7788c39..bc9513a 100644 (file)
@@ -448,10 +448,7 @@ static void ui_node_menu_column(NodeLinkArg *arg, int nclass, const char *cname)
        int compatibility = 0;
 
        if (ntree->type == NTREE_SHADER) {
-               if (BKE_scene_use_new_shading_nodes(arg->scene))
-                       compatibility = NODE_NEW_SHADING;
-               else
-                       compatibility = NODE_OLD_SHADING;
+               compatibility = NODE_NEW_SHADING;
        }
 
        /* generate array of node types sorted by UI name */