From 6830ba12a8591f9e7e5bff243f560bd570fbdce2 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Tue, 6 Sep 2022 11:33:47 -0500 Subject: Cleanup: Remove unnecessary node sorting, rename variables Changing node colors shouldn't change the output of `node_sort`. --- source/blender/editors/space_node/node_edit.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index 9167b96b76f..984eecc229c 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -2171,24 +2171,23 @@ static int node_copy_color_exec(bContext *C, wmOperator *UNUSED(op)) SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &ntree = *snode.edittree; - bNode *node = nodeGetActive(&ntree); - if (!node) { + bNode *active_node = nodeGetActive(&ntree); + if (!active_node) { return OPERATOR_CANCELLED; } - LISTBASE_FOREACH (bNode *, node_iter, &ntree.nodes) { - if (node_iter->flag & NODE_SELECT && node_iter != node) { - if (node->flag & NODE_CUSTOM_COLOR) { - node_iter->flag |= NODE_CUSTOM_COLOR; - copy_v3_v3(node_iter->color, node->color); + LISTBASE_FOREACH (bNode *, node, &ntree.nodes) { + if (node->flag & NODE_SELECT && node != active_node) { + if (active_node->flag & NODE_CUSTOM_COLOR) { + node->flag |= NODE_CUSTOM_COLOR; + copy_v3_v3(node->color, active_node->color); } else { - node_iter->flag &= ~NODE_CUSTOM_COLOR; + node->flag &= ~NODE_CUSTOM_COLOR; } } } - node_sort(ntree); WM_event_add_notifier(C, NC_NODE | ND_DISPLAY, nullptr); return OPERATOR_FINISHED; -- cgit v1.2.3