diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-14 22:11:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-14 22:11:45 +0400 |
| commit | 5c93135ef9a1e7265ead3b92b10ea9a4ef82b909 (patch) | |
| tree | c85a94462dc44e08e4e627582980e6a016d72504 /source/blender/nodes | |
| parent | 8b39ed9458ff1f5790b543d94cd82ac53691fd4c (diff) | |
fix [#29887] Alt + g in a node group results in crash
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/intern/node_common.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index fdce1f92948..5a6cebb51ce 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -530,7 +530,8 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) BLI_addtail(&ntree->links, link); } - /* and copy across the animation */ + /* and copy across the animation, + * note that the animation data's action can be NULL here */ if (wgroup->adt) { LinkData *ld, *ldn=NULL; bAction *waction; @@ -550,7 +551,9 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) } /* free temp action too */ - free_libblock(&G.main->action, waction); + if (waction) { + free_libblock(&G.main->action, waction); + } } /* delete the group instance. this also removes old input links! */ |