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

Fix T45959: DistanceKey output incorrect

Browse Source
This commit is contained in:
Campbell Barton
2015-08-31 16:20:21 +10:00
parent d9e71d5e16
commit 489a5d34b7
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
View File

@@ -81,10 +81,20 @@ void DistanceMatteNode::convertToOperations(NodeConverter &converter, const Comp
operation = matte;
}
converter.mapOutputSocket(outputSocketMatte, operation->getOutputSocket(0));
converter.addLink(operation->getOutputSocket(), operationAlpha->getInputSocket(1));
converter.mapOutputSocket(outputSocketMatte, operation->getOutputSocket());
converter.mapOutputSocket(outputSocketImage, operationAlpha->getOutputSocket());
if (storage->channel != 1) {
ConvertYCCToRGBOperation *inv_convert = new ConvertYCCToRGBOperation();
inv_convert->setMode(0); /* BLI_YCC_ITU_BT601 */
converter.addOperation(inv_convert);
converter.addLink(operationAlpha->getOutputSocket(0), inv_convert->getInputSocket(0));
converter.mapOutputSocket(outputSocketImage, inv_convert->getOutputSocket());
}
else {
converter.mapOutputSocket(outputSocketImage, operationAlpha->getOutputSocket());
}
converter.addPreview(operationAlpha->getOutputSocket());
}