diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-23 19:02:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-23 19:03:14 +0300 |
| commit | 3bf7c846eeb4a728c62100b40463874d83f5b3e0 (patch) | |
| tree | 9ce90a2339ca5b26918883c3894eec31c87309ff /source/blender/editors/space_node/node_templates.c | |
| parent | e5abce922094cbacd316253be73eeed6ce5a6e92 (diff) | |
Fix T57996: Crash - delete node with a driven parameter
Diffstat (limited to 'source/blender/editors/space_node/node_templates.c')
| -rw-r--r-- | source/blender/editors/space_node/node_templates.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 64c898cb628..47e9bc7fa26 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -124,7 +124,7 @@ static void node_clear_recursive(bNode *node) node_clear_recursive(input->link->fromnode); } -static void node_remove_linked(bNodeTree *ntree, bNode *rem_node) +static void node_remove_linked(Main *bmain, bNodeTree *ntree, bNode *rem_node) { bNode *node, *next; bNodeSocket *sock; @@ -152,7 +152,7 @@ static void node_remove_linked(bNodeTree *ntree, bNode *rem_node) if (node->flag & NODE_TEST) { if (node->id) id_us_min(node->id); - nodeFreeNode(ntree, node); + nodeDeleteNode(bmain, ntree, node); } } } @@ -178,7 +178,7 @@ static void node_socket_remove(Main *bmain, bNodeTree *ntree, bNode *node_to, bN if (!sock_to->link) return; - node_remove_linked(ntree, sock_to->link->fromnode); + node_remove_linked(bmain, ntree, sock_to->link->fromnode); sock_to->flag |= SOCK_COLLAPSED; nodeUpdate(ntree, node_to); @@ -269,7 +269,7 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode * } /* remove node */ - node_remove_linked(ntree, node_prev); + node_remove_linked(bmain, ntree, node_prev); } nodeUpdate(ntree, node_from); |