blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Jacques Lucke 2022-02-07 17:57:01 +01:00
parent fe4e85a924 2f868e5647
commit 2f7aecb6ce
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_node/node_relationships.cc
View File

@ -365,10 +365,7 @@ void sort_multi_input_socket_links(SpaceNode &snode,
}
}
static void snode_autoconnect(Main &bmain,
SpaceNode &snode,
const bool allow_multiple,
const bool replace)
static void snode_autoconnect(SpaceNode &snode, const bool allow_multiple, const bool replace)
{
bNodeTree *ntree = snode.edittree;
Vector<bNode *> sorted_nodes;
@ -441,10 +438,6 @@ static void snode_autoconnect(Main &bmain,
}
}
}
if (numlinks > 0) {
BKE_ntree_update_main_tree(&bmain, ntree, nullptr);
}
}
/** \} */
@ -1304,13 +1297,13 @@ static int node_make_link_exec(bContext *C, wmOperator *op)
ED_preview_kill_jobs(CTX_wm_manager(C), &bmain);
snode_autoconnect(bmain, snode, true, replace);
snode_autoconnect(snode, true, replace);
/* deselect sockets after linking */
node_deselect_all_input_sockets(snode, false);
node_deselect_all_output_sockets(snode, false);
ED_node_tree_propagate_change(C, CTX_data_main(C), snode.edittree);
ED_node_tree_propagate_change(C, &bmain, snode.edittree);
return OPERATOR_FINISHED;
}