[Bf-blender-cvs] [8132553] master: Fix (unreported) crash when ungrouping a nodegroup with some animated node.
Bastien Montagne
noreply at git.blender.org
Sat Feb 20 13:16:47 CET 2016
Commit: 813255355379b236e91c23e758109d37f080a71d
Author: Bastien Montagne
Date: Sat Feb 20 13:15:40 2016 +0100
Branches: master
https://developer.blender.org/rB813255355379b236e91c23e758109d37f080a71d
Fix (unreported) crash when ungrouping a nodegroup with some animated node.
Was accessing already freed action in temp nodegroup animation data...
===================================================================
M source/blender/editors/space_node/node_group.c
===================================================================
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index b57f95d..5c58e9b 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -253,7 +253,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
if (wgroup->adt) {
LinkData *ld, *ldn = NULL;
bAction *waction;
-
+
/* firstly, wgroup needs to temporary dummy action that can be destroyed, as it shares copies */
waction = wgroup->adt->action = BKE_action_copy(wgroup->adt->action);
@@ -271,6 +271,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
/* free temp action too */
if (waction) {
BKE_libblock_free(G.main, waction);
+ wgroup->adt->action = NULL;
}
}
More information about the Bf-blender-cvs
mailing list