diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-03-15 00:58:16 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-03-15 00:58:16 +0300 |
| commit | e91dddc923fd0f238e6d6856dedbfc044c90b2c1 (patch) | |
| tree | 2eb1d737abce19629ce2dcde5403c8d8c3485543 /source | |
| parent | ea9866a75f9e7f348364617b866cd2e6f057e458 (diff) | |
Bugfix: Node editor, ALT+G "UnGroup" crashed when group was editable.
Now it exits this editing mode, and ungroups nicely.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/editnode.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c index 1f363f8b428..2bb4f34a313 100644 --- a/source/blender/src/editnode.c +++ b/source/blender/src/editnode.c @@ -510,8 +510,15 @@ static void snode_make_group_editable(SpaceNode *snode, bNode *gnode) static void node_ungroup(SpaceNode *snode) { bNode *gnode; + + /* are we inside of a group? */ + gnode= snode_get_editgroup(snode); + if(gnode) + snode_make_group_editable(snode, NULL); gnode= nodeGetActive(snode->edittree); + if(gnode==NULL) return; + if(gnode->type!=NODE_GROUP) error("Not a group"); else { |