[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43762] trunk/blender/source/blender/ editors/space_node/node_edit.c: Removed check for active node in edited node group to allow node group editing toggle .

Lukas Toenne lukas.toenne at googlemail.com
Mon Jan 30 10:01:01 CET 2012


Revision: 43762
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43762
Author:   lukastoenne
Date:     2012-01-30 09:00:54 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Removed check for active node in edited node group to allow node group editing toggle. This enables closing an empty node group again (after removing all nodes or when empty group is added via menu). Fix for bug #30018.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2012-01-30 08:48:11 UTC (rev 43761)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2012-01-30 09:00:54 UTC (rev 43762)
@@ -855,14 +855,13 @@
 	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);



More information about the Bf-blender-cvs mailing list