diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-18 10:51:06 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-18 10:51:06 +0300 |
commit | 51bc509d62c6a1f9abbf1627e42f40630bb649c5 (patch) | |
tree | cce656f914519e97f27a894fd200426be757ceaf | |
parent | 727b500465999c28ba3e923d625b6226919deda1 (diff) |
Use the new dissolve function for all operators.temp-nodes-intersect-alt-key
-rw-r--r-- | source/blender/editors/space_node/node_edit.cc | 3 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_relationships.cc | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index af9c888cbf7..b3d1cc2ffe3 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -1876,9 +1876,10 @@ static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op)) ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C)); + ED_node_dissolve_links(bmain, snode->edittree, NULL); + LISTBASE_FOREACH_MUTABLE (bNode *, node, &snode->edittree->nodes) { if (node->flag & SELECT) { - nodeInternalRelink(snode->edittree, node); nodeRemoveNode(bmain, snode->edittree, node, true); } } diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index 407aeee60c2..ae9dd6081c9 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -1519,11 +1519,7 @@ static int detach_links_exec(bContext *C, wmOperator *UNUSED(op)) ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C)); - LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { - if (node->flag & SELECT) { - nodeInternalRelink(ntree, node); - } - } + ED_node_dissolve_links(CTX_data_main(C), ntree, NULL); ntreeUpdateTree(CTX_data_main(C), ntree); |