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

Fix: Image node alpha socket converted to operations twice

Browse Source 
On selecting a multi-layer image with a combined pass, a "Combined"
socket is created and default combined pass socket "Image" is
disabled by setting `SOCK_UNAVAIL` flag. When converting into
operations, `ImageNode` converts alpha socket on finding any socket with
a combined pass without checking the flag.

Since commit rB93e2491ee724 an assertion fails when mapping sockets
twice because now map `add_new` is used.

Reviewed By: jbakker

Differential Revision: https://developer.blender.org/D11566
This commit is contained in:
Manuel Castilla
2021-06-16 14:04:24 +02:00
parent b66600b9f3
commit 88aa056d1a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/nodes/COM_ImageNode.cc
View File

@@ -168,7 +168,7 @@ void ImageNode::convertToOperations(NodeConverter &converter,
if (index == 0 && operation) {
converter.addPreview(operation->getOutputSocket());
}
if (STREQ(rpass->name, RE_PASSNAME_COMBINED)) {
if (STREQ(rpass->name, RE_PASSNAME_COMBINED) && !(bnodeSocket->flag & SOCK_UNAVAIL)) {
for (NodeOutput *alphaSocket : getOutputSockets()) {
bNodeSocket *bnodeAlphaSocket = alphaSocket->getbNodeSocket();
if (!STREQ(bnodeAlphaSocket->name, "Alpha")) {