From 477f35559cf20ea6cc81fa3d3a0ec1b886dbf5e4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 May 2014 02:32:25 +1000 Subject: Code cleanup: reorder BKE_scene_use_new_shading_nodes checks last --- source/blender/nodes/shader/node_shader_tree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/nodes') diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 53f97e0d36c..4288b8fbcdc 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -79,7 +79,9 @@ static void shader_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tre Scene *scene = CTX_data_scene(C); Object *ob = OBACT; - if (!BKE_scene_use_new_shading_nodes(scene) || snode->shaderfrom == SNODE_SHADER_OBJECT) { + if ((snode->shaderfrom == SNODE_SHADER_OBJECT) || + (BKE_scene_use_new_shading_nodes(scene) == false)) + { if (ob) { *r_from = &ob->id; if (ob->type == OB_LAMP) { -- cgit v1.2.3