Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-11-23 19:02:55 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-11-23 19:03:14 +0300
commit3bf7c846eeb4a728c62100b40463874d83f5b3e0 (patch)
tree9ce90a2339ca5b26918883c3894eec31c87309ff /source/blender/editors/space_node/node_edit.c
parente5abce922094cbacd316253be73eeed6ce5a6e92 (diff)
Fix T57996: Crash - delete node with a driven parameter
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
-rw-r--r--source/blender/editors/space_node/node_edit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index aca87261da8..746a37fe565 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1586,7 +1586,7 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op))
do_tag_update |= (do_tag_update || node_connected_to_output(bmain, snode->edittree, node));
if (node->id)
id_us_min(node->id);
- nodeFreeNode(snode->edittree, node);
+ nodeDeleteNode(bmain, snode->edittree, node);
}
}
@@ -1666,6 +1666,7 @@ void NODE_OT_switch_view_update(wmOperatorType *ot)
/* ****************** Delete with reconnect ******************* */
static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op))
{
+ Main *bmain = CTX_data_main(C);
SpaceNode *snode = CTX_wm_space_node(C);
bNode *node, *next;
@@ -1679,7 +1680,7 @@ static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op))
/* check id user here, nodeFreeNode is called for free dbase too */
if (node->id)
id_us_min(node->id);
- nodeFreeNode(snode->edittree, node);
+ nodeDeleteNode(bmain, snode->edittree, node);
}
}