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

Compositor: Cleanup, de-duplicate some code

Browse Source
This commit is contained in:
Sergey Sharybin
2017-09-13 14:57:57 +05:00
parent 4fde0910d5
commit 17a117c7a0
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/blender/compositor/nodes/COM_RenderLayersNode.cpp
View File

@@ -77,42 +77,36 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter,
if (rpass == NULL) {
continue;
}
RenderLayersProg *operation;
bool is_preview;
if (STREQ(rpass->name, RE_PASSNAME_COMBINED) &&
STREQ(output->getbNodeSocket()->name, "Alpha"))
{
testSocketLink(converter,
context,
output,
new RenderLayersAlphaProg(rpass->name,
COM_DT_VALUE,
rpass->channels),
scene,
layerId,
false);
operation = new RenderLayersAlphaProg(rpass->name,
COM_DT_VALUE,
rpass->channels);
is_preview = false;
}
else if (STREQ(rpass->name, RE_PASSNAME_Z)) {
testSocketLink(converter,
context,
output,
new RenderLayersDepthProg(rpass->name,
COM_DT_VALUE,
rpass->channels),
scene,
layerId,
false);
operation = new RenderLayersDepthProg(rpass->name,
COM_DT_VALUE,
rpass->channels);
is_preview = false;
}
else {
DataType type = ((rpass->channels == 4)? COM_DT_COLOR : ((rpass->channels == 3)? COM_DT_VECTOR : COM_DT_VALUE));
testSocketLink(converter,
context,
output,
new RenderLayersProg(rpass->name,
type,
rpass->channels),
scene,
layerId,
STREQ(output->getbNodeSocket()->name, "Image"));
operation = new RenderLayersProg(rpass->name,
type,
rpass->channels);
is_preview = STREQ(output->getbNodeSocket()->name, "Image");
}
testSocketLink(converter,
context,
output,
operation,
scene,
layerId,
is_preview);
}
}