Lukas Tönne
005dabbd9a
This issue is because of a somewhat "special" behavior in old code, which got lost during rB09874df: There was a variant of the `relinkConnections` function which would leave the socket completely unconnected. This is not a valid state really (given that each unconnected input must otherwise connected to a constant `Set` type node), but was used as a way to distinguish connected alpha/depth sockets in composite and viewer output nodes. https://developer.blender.org/diffusion/B/browse/master/source/blender/compositor/intern/COM_InputSocket.cpp;28a829893c702918afc5ac1945a06eaefa611594$69 After the large cleanup patch ({D309}) every socket is now automatically connected to a constant, such that `getInputSocketReader` will never return a NULL pointer. This breaks the previous test method, which needs to be replaced by more explicit flags. Luckily this was done only for very few output nodes (Composite, Viewer, Output-File). These now use the regular SetValueOperation default in case "use alpha" is disabled, but set this to an explicit 1.0 value instead of mapping to the node socket.
78 lines
3.0 KiB
C++
78 lines
3.0 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor:
|
|
* Jeroen Bakker
|
|
* Monique Dewanchand
|
|
*/
|
|
|
|
#include "COM_ViewerNode.h"
|
|
#include "BKE_global.h"
|
|
|
|
#include "COM_ViewerOperation.h"
|
|
#include "COM_ExecutionSystem.h"
|
|
|
|
ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode)
|
|
{
|
|
/* pass */
|
|
}
|
|
|
|
void ViewerNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
|
|
{
|
|
bNode *editorNode = this->getbNode();
|
|
bool is_active = (editorNode->flag & NODE_DO_OUTPUT_RECALC || context.isRendering()) &&
|
|
((editorNode->flag & NODE_DO_OUTPUT) && this->isInActiveGroup());
|
|
bool ignore_alpha = editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA;
|
|
|
|
NodeInput *imageSocket = this->getInputSocket(0);
|
|
NodeInput *alphaSocket = this->getInputSocket(1);
|
|
NodeInput *depthSocket = this->getInputSocket(2);
|
|
Image *image = (Image *)this->getbNode()->id;
|
|
ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
|
|
ViewerOperation *viewerOperation = new ViewerOperation();
|
|
viewerOperation->setbNodeTree(context.getbNodeTree());
|
|
viewerOperation->setImage(image);
|
|
viewerOperation->setImageUser(imageUser);
|
|
viewerOperation->setActive(is_active);
|
|
viewerOperation->setChunkOrder((OrderOfChunks)editorNode->custom1);
|
|
viewerOperation->setCenterX(editorNode->custom3);
|
|
viewerOperation->setCenterY(editorNode->custom4);
|
|
/* alpha socket gives either 1 or a custom alpha value if "use alpha" is enabled */
|
|
viewerOperation->setUseAlphaInput(ignore_alpha || alphaSocket->isLinked());
|
|
|
|
viewerOperation->setViewSettings(context.getViewSettings());
|
|
viewerOperation->setDisplaySettings(context.getDisplaySettings());
|
|
|
|
viewerOperation->setResolutionInputSocketIndex(0);
|
|
if (!imageSocket->isLinked()) {
|
|
if (alphaSocket->isLinked()) {
|
|
viewerOperation->setResolutionInputSocketIndex(1);
|
|
}
|
|
}
|
|
|
|
converter.addOperation(viewerOperation);
|
|
converter.mapInputSocket(imageSocket, viewerOperation->getInputSocket(0));
|
|
/* only use alpha link if "use alpha" is enabled */
|
|
if (ignore_alpha)
|
|
converter.addInputValue(viewerOperation->getInputSocket(1), 1.0f);
|
|
else
|
|
converter.mapInputSocket(alphaSocket, viewerOperation->getInputSocket(1));
|
|
converter.mapInputSocket(depthSocket, viewerOperation->getInputSocket(2));
|
|
|
|
converter.addNodeInputPreview(imageSocket);
|
|
}
|