archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* make it possible to composite without an compositor node [#31878]

Browse Source 
Tiles Compositor: Fails without 'Compositor' output node. Regression.
This commit is contained in:
Jeroen Bakker
2012-06-21 17:58:12 +00:00
parent d406e274e0
commit 7a8d60ec7d
7 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
View File

@@ -39,21 +39,17 @@
#include "COM_ReadBufferOperation.h"
#include "COM_ViewerBaseOperation.h"
Node *ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree, bNode *groupnode)
void ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree, bNode *groupnode)
{
vector<Node *>& nodes = system.getNodes();
vector<SocketConnection *>& links = system.getConnections();
Node *mainnode = NULL;
const bNode *activeGroupNode = system.getContext().getActivegNode();
bool isActiveGroup = activeGroupNode == groupnode;
/* add all nodes of the tree to the node list */
bNode *node = (bNode *)tree->nodes.first;
while (node != NULL) {
Node *execnode = addNode(nodes, node, isActiveGroup);
if (node->type == CMP_NODE_COMPOSITE) {
mainnode = execnode;
}
addNode(nodes, node, isActiveGroup);
node = (bNode *)node->next;
}
@@ -74,8 +70,6 @@ Node *ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_sta
groupNode->ungroup(system);
}
}
return mainnode;
}
void ExecutionSystemHelper::addNode(vector<Node *>& nodes, Node *node)