[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52510] trunk/blender/source/blender/ compositor/intern/COM_ExecutionSystem.cpp: Compositor: Disabled debug assert checks for connected input sockets after convertToOperations .
Lukas Toenne
lukas.toenne at googlemail.com
Fri Nov 23 13:39:50 CET 2012
Revision: 52510
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52510
Author: lukastoenne
Date: 2012-11-23 12:39:49 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Compositor: Disabled debug assert checks for connected input sockets after convertToOperations. This breaks quite a lot and is not really necessary, since connected Node inputs are ignored later on. Connected outputs however are still forbidden, this indicates a real bug.
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2012-11-23 10:03:50 UTC (rev 52509)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2012-11-23 12:39:49 UTC (rev 52510)
@@ -247,9 +247,14 @@
*/
static void debug_check_node_connections(Node *node)
{
+ /* note: connected inputs are not checked here,
+ * it would break quite a lot and such inputs are ignored later anyway
+ */
+#if 0
for (int i = 0; i < node->getNumberOfInputSockets(); ++i) {
BLI_assert(!node->getInputSocket(i)->isConnected());
}
+#endif
for (int i = 0; i < node->getNumberOfOutputSockets(); ++i) {
BLI_assert(!node->getOutputSocket(i)->isConnected());
}
More information about the Bf-blender-cvs
mailing list