blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Compositor: Compositor Output should Follow Active Node. #105235

Merged
Jeroen Bakker merged 1 commits from Jeroen-Bakker/blender:compositor-active-compositor-output-node into blender-v3.5-release 2023-02-27 12:58:37 +01:00
Conversation 0 Commits 1 Files Changed 3 +6 -5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/compositor/nodes/COM_CompositorNode.cc
View File

@ -15,7 +15,8 @@ void CompositorNode::convert_to_operations(NodeConverter &converter,
const CompositorContext &context) const
{
const bNode *editor_node = this->get_bnode();
bool is_active = (editor_node->flag & NODE_DO_OUTPUT_RECALC) || context.is_rendering();
bool is_active = ((editor_node->flag & NODE_DO_OUTPUT_RECALC) || context.is_rendering()) &&
(editor_node->flag & NODE_DO_OUTPUT);
bool ignore_alpha = (editor_node->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA) != 0;
NodeInput *image_socket = this->get_input_socket(0);

4
source/blender/compositor/nodes/COM_SplitViewerNode.cc
View File

@ -17,7 +17,7 @@ void SplitViewerNode::convert_to_operations(NodeConverter &converter,
const CompositorContext &context) const
{
const bNode *editor_node = this->get_bnode();
bool do_output = (editor_node->flag & NODE_DO_OUTPUT_RECALC || context.is_rendering()) &&
bool is_active = (editor_node->flag & NODE_DO_OUTPUT_RECALC || context.is_rendering()) &&
(editor_node->flag & NODE_DO_OUTPUT);
NodeInput *image1Socket = this->get_input_socket(0);
@ -54,7 +54,7 @@ void SplitViewerNode::convert_to_operations(NodeConverter &converter,
converter.add_preview(split_viewer_operation->get_output_socket());
if (do_output) {
if (is_active) {
converter.register_viewer(viewer_operation);
}
}

4
source/blender/compositor/nodes/COM_ViewerNode.cc
View File

@ -16,7 +16,7 @@ void ViewerNode::convert_to_operations(NodeConverter &converter,
const CompositorContext &context) const
{
const bNode *editor_node = this->get_bnode();
bool do_output = (editor_node->flag & NODE_DO_OUTPUT_RECALC || context.is_rendering()) &&
bool is_active = (editor_node->flag & NODE_DO_OUTPUT_RECALC || context.is_rendering()) &&
(editor_node->flag & NODE_DO_OUTPUT);
bool ignore_alpha = (editor_node->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA) != 0;
@ -61,7 +61,7 @@ void ViewerNode::convert_to_operations(NodeConverter &converter,
converter.add_node_input_preview(image_socket);
if (do_output) {
if (is_active) {
converter.register_viewer(viewer_operation);
}
}