[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14147] trunk/blender/source/blender/ blenkernel/intern/node.c:
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Mar 16 21:49:28 CET 2008
Revision: 14147
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14147
Author: blendix
Date: 2008-03-16 21:49:10 +0100 (Sun, 16 Mar 2008)
Log Message:
-----------
Fix for bug #8560: grouping nodes could lead to multiple links to the
same input, if the nodes had been grouped separately before.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2008-03-16 20:04:41 UTC (rev 14146)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2008-03-16 20:49:10 UTC (rev 14147)
@@ -534,6 +534,14 @@
break;
}
}
+
+ /* set socket own_index to zero since it can still have a value
+ * from being in a group before, otherwise it doesn't get a unique
+ * index in group_verify_own_indices */
+ for(sock= node->inputs.first; sock; sock= sock->next)
+ sock->own_index= 0;
+ for(sock= node->outputs.first; sock; sock= sock->next)
+ sock->own_index= 0;
}
}
@@ -589,6 +597,10 @@
}
}
}
+
+ /* update node levels */
+ ntreeSolveOrder(ntree);
+
return gnode;
}
More information about the Bf-blender-cvs
mailing list