[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42538] branches/tile/source/blender/ compositor/nodes/COM_GroupNode.cpp: Fix for group nodes in new compositor: when ungrouping the internal groups prior to conversion all unlinked inputs of the group node would be ignored .

[Lukas Toenne]

Revision: 42538
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42538
Author:   lukastoenne
Date:     2011-12-09 14:40:30 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Fix for group nodes in new compositor: when ungrouping the internal groups 
prior to conversion all unlinked inputs of the group node would be ignored. 
What should actually happen is that inputs without _internal_ connections are 
ignored, since these are not used for any outputs.

Modified Paths:
--------------
    branches/tile/source/blender/compositor/nodes/COM_GroupNode.cpp

Modified: branches/tile/source/blender/compositor/nodes/COM_GroupNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_GroupNode.cpp     
2011-12-09 14:30:44 UTC (rev 42537)
+++ branches/tile/source/blender/compositor/nodes/COM_GroupNode.cpp     
2011-12-09 14:40:30 UTC (rev 42538)
@@ -60,13 +60,13 @@
 
        for (index = 0 ; index < inputsockets.size();index ++) {
                InputSocket * inputSocket = inputsockets[index];
-               if (inputSocket->isConnected()) {
+               if (inputSocket->getGroupOutputSocket()->isConnected()) {
                        SocketProxyNode * proxy = new 
SocketProxyNode(this->getbNode());
                        
inputSocket->relinkConnections(proxy->getInputSocket(0), true, index, &system);
                        
inputSocket->getGroupOutputSocket()->relinkConnections(proxy->getOutputSocket(0));
                        ExecutionSystemHelper::addNode(system.getNodes(), 
proxy);
-        }
-    }
+               }
+       }
        for (index = 0 ; index < outputsockets.size();index ++) {
                OutputSocket * outputSocket = outputsockets[index];
                SocketProxyNode * proxy = new SocketProxyNode(this->getbNode());

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs