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/nodes/shader/node_shader_tree.c | |
| parent | b72eca435ebdbd10359b7c0fc67cb9eddc1b2dcf (diff) | |
Code cleanup: reorder BKE_scene_use_new_shading_nodes checks last
Diffstat (limited to 'source/blender/nodes/shader/node_shader_tree.c')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |