[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49058] trunk/blender/source/blender/ editors/space_node/node_edit.c: Fix #32118, Reroute nodes inside groups get created in wonky places.

Lukas Toenne lukas.toenne at googlemail.com
Thu Jul 19 10:23:57 CEST 2012


Revision: 49058
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49058
Author:   lukastoenne
Date:     2012-07-19 08:23:56 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Fix #32118, Reroute nodes inside groups get created in wonky places. The operator needs to take into account the potential offset from the group node (most operators use the node_add_node helper function which does this).

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-07-19 08:04:12 UTC (rev 49057)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2012-07-19 08:23:56 UTC (rev 49058)
@@ -3142,6 +3142,7 @@
 {
 	SpaceNode *snode = CTX_wm_space_node(C);
 	ARegion *ar = CTX_wm_region(C);
+	bNode *gnode = node_tree_get_editgroup(snode->nodetree);
 	float mcoords[256][2];
 	int i = 0;
 
@@ -3174,6 +3175,10 @@
 				rerouteNode = nodeAddNode(snode->edittree, &ntemp);
 				rerouteNode->locx = insertPoint[0];
 				rerouteNode->locy = insertPoint[1];
+				if (gnode) {
+					rerouteNode->locx -= gnode->locx;
+					rerouteNode->locy -= gnode->locy;
+				}
 				
 				nodeAddLink(snode->edittree, link->fromnode, link->fromsock, rerouteNode, rerouteNode->inputs.first);
 				link->fromnode = rerouteNode;




More information about the Bf-blender-cvs mailing list