Revision: 52429
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52429
Author: lukastoenne
Date: 2012-11-21 09:32:40 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Fix for debug assert failure with Reroute nodes in compositor. After
redirecting links from the reroute output the input must be completely
unlinked, otherwise the debug_check_node_connections will complain (this is a
sanity check that ensures all the original Nodes have been fully reconnected to
Operations).
Modified Paths:
--------------
trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
Modified: trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
2012-11-21 09:25:06 UTC (rev 52428)
+++ trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
2012-11-21 09:32:40 UTC (rev 52429)
@@ -43,6 +43,10 @@
if (input->getDataType() == output->getDataType()) {
if (input->isConnected()) {
output->relinkConnections(input->getConnection()->getFromSocket(), false);
+ /* output connections have been redirected,
+ * remove the input connection to completely
unlink the node.
+ */
+ input->unlinkConnections(graph);
return;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
