diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
| commit | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (patch) | |
| tree | 6741012808ab0c83f96ff7e52c8168cb62b8c8b7 /source/blender/editors/space_node | |
| parent | 35678eaae52a8436469b06307eaaf4d8503863f1 (diff) | |
| parent | ed0d2b5e9205fc99ed38957f01acaa62c3811333 (diff) | |
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 71f0917a4f3..fe734e53651 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -855,14 +855,13 @@ static int node_group_edit_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e SpaceNode *snode = CTX_wm_space_node(C); bNode *gnode; - gnode = nodeGetActive(snode->edittree); - if (!gnode) - return OPERATOR_CANCELLED; - /* XXX callback? */ - if(gnode && gnode->id && GS(gnode->id->name)==ID_NT && gnode->id->lib) { - uiPupMenuOkee(C, op->type->idname, "Make group local?"); - return OPERATOR_CANCELLED; + if (snode->nodetree==snode->edittree) { + gnode = nodeGetActive(snode->edittree); + if(gnode && gnode->id && GS(gnode->id->name)==ID_NT && gnode->id->lib) { + uiPupMenuOkee(C, op->type->idname, "Make group local?"); + return OPERATOR_CANCELLED; + } } return node_group_edit_exec(C, op); |