kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixed own regression introduced in recent compositor commit

Browse Source 
MuteNode could be used as a replacement for other nodes when
using fast calculation or when using unknown node from blender.

Should work properly now.
This commit is contained in:
Sergey Sharybin 2012-07-30 16:39:39 +00:00
parent 46ac23d04e
commit 9c35147666
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/compositor/nodes/COM_MuteNode.cpp
View File

@ -48,6 +48,11 @@ void MuteNode::reconnect(ExecutionSystem *graph, OutputSocket *output)
}
}
createDefaultOutput(graph, output);
}
void MuteNode::createDefaultOutput(ExecutionSystem *graph, OutputSocket *output)
{
NodeOperation *operation = NULL;
switch (output->getDataType()) {
case COM_DT_VALUE:
@ -100,7 +105,10 @@ void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co
bNode *editorNode = this->getbNode();
vector<OutputSocket *> &outputsockets = this->getOutputSockets();
if (editorNode->typeinfo->internal_connect) {
/* mute node is also used for unknown nodes and couple of nodes in fast mode
* can't use generic routines in that case
*/
if ((editorNode->flag & NODE_MUTED) && editorNode->typeinfo->internal_connect) {
vector<InputSocket *> &inputsockets = this->getInputSockets();
bNodeTree *editorTree = (bNodeTree *) context->getbNodeTree();
SocketMap socketMap;
@ -117,7 +125,14 @@ void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co
InputSocket *fromSocket = (InputSocket *) socketMap.find(link->fromsock)->second;
OutputSocket *toSocket = (OutputSocket *) socketMap.find(link->tosock)->second;
toSocket->relinkConnections(fromSocket->getConnection()->getFromSocket(), false);
if (toSocket->isConnected()) {
if (fromSocket->isConnected()) {
toSocket->relinkConnections(fromSocket->getConnection()->getFromSocket(), false);
}
else {
createDefaultOutput(graph, toSocket);
}
}
}
}

1
source/blender/compositor/nodes/COM_MuteNode.h
View File

@ -43,6 +43,7 @@ private:
typedef std::map<bNodeSocket *, Socket *> SocketMap;
void reconnect(ExecutionSystem *graph, OutputSocket *output);
void createDefaultOutput(ExecutionSystem *graph, OutputSocket *output);
template<class SocketType> void fillSocketMap(vector<SocketType *> &sockets, SocketMap &socketMap);
};