[Bf-blender-cvs] [eb3e56a36e1] master: Fix: Wrong output types for some compositor nodes

[Omar Emara]

Commit: eb3e56a36e18fd4d560a31c2b60ceb235fd0da09
Author: Omar Emara
Date:   Thu Jul 14 13:52:44 2022 +0200
Branches: master
https://developer.blender.org/rBeb3e56a36e18fd4d560a31c2b60ceb235fd0da09

Fix: Wrong output types for some compositor nodes

The Difference Matte and RGB To BW nodes have a wrong output type. They
should be floats but are of type color.

This is a regression that was introduced during the migration to the
socket builder API in D13266.

Reviewed By: Blendify, fclem

Differential Revision: https://developer.blender.org/D15232

===================================================================

M	source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
M	source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc

===================================================================

diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
index 20dd61a9725..b87bbe439db 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
@@ -19,7 +19,7 @@ static void cmp_node_diff_matte_declare(NodeDeclarationBuilder &b)
   b.add_input<decl::Color>(N_("Image 1")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
   b.add_input<decl::Color>(N_("Image 2")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
   b.add_output<decl::Color>(N_("Image"));
-  b.add_output<decl::Color>(N_("Matte"));
+  b.add_output<decl::Float>(N_("Matte"));
 }
 
 static void node_composit_init_diff_matte(bNodeTree *UNUSED(ntree), bNode *node)
diff --git a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
index 0dfdeda24e6..df669d5beda 100644
--- a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
@@ -49,7 +49,7 @@ namespace blender::nodes::node_composite_val_to_rgb_cc {
 static void cmp_node_rgbtobw_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Color>(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f});
-  b.add_output<decl::Color>(N_("Val"));
+  b.add_output<decl::Float>(N_("Val"));
 }
 
 }  // namespace blender::nodes::node_composite_val_to_rgb_cc