[Bf-blender-cvs] [8e40bb2dea0] master: Nodes: Fix compositor viewer nodes having wrong alpha channel

Aaron Carlisle noreply at git.blender.org
Wed Sep 29 02:44:01 CEST 2021


Commit: 8e40bb2dea005a691160b48c94087868a8d21548
Author: Aaron Carlisle
Date:   Tue Sep 28 20:33:42 2021 -0400
Branches: master
https://developer.blender.org/rB8e40bb2dea005a691160b48c94087868a8d21548

Nodes: Fix compositor viewer nodes having wrong alpha channel

Default should be black image with an alpha value of 1.

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

M	source/blender/nodes/composite/nodes/node_composite_composite.cc
M	source/blender/nodes/composite/nodes/node_composite_levels.cc
M	source/blender/nodes/composite/nodes/node_composite_viewer.cc

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

diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc
index 5076a24d155..170fecb251c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_composite.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc
@@ -29,7 +29,7 @@ namespace blender::nodes {
 
 static void cmp_node_composite_declare(NodeDeclarationBuilder &b)
 {
-  b.add_input<decl::Color>("Image");
+  b.add_input<decl::Color>("Image").default_value({0.0f, 0.0f, 0.0f, 1.0f});
   b.add_input<decl::Float>("Alpha").default_value(1.0f).min(0.0f).max(1.0f);
   b.add_input<decl::Float>("Z").default_value(1.0f).min(0.0f).max(1.0f);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc
index b447b7510f1..aaab8dcc874 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc
@@ -29,7 +29,7 @@ namespace blender::nodes {
 
 static void cmp_node_levels_declare(NodeDeclarationBuilder &b)
 {
-  b.add_input<decl::Color>("Image");
+  b.add_input<decl::Color>("Image").default_value({0.0f, 0.0f, 0.0f, 1.0f});
   b.add_output<decl::Float>("Mean");
   b.add_output<decl::Float>("Std Dev");
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc
index 48ba0abc922..7234d4d8eb2 100644
--- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc
@@ -32,7 +32,7 @@ namespace blender::nodes {
 
 static void cmp_node_viewer_declare(NodeDeclarationBuilder &b)
 {
-  b.add_input<decl::Color>("Image");
+  b.add_input<decl::Color>("Image").default_value({0.0f, 0.0f, 0.0f, 1.0f});
   b.add_input<decl::Float>("Alpha").default_value(1.0f).min(0.0f).max(1.0f);
   b.add_input<decl::Float>("Z").default_value(1.0f).min(0.0f).max(1.0f);
 }



More information about the Bf-blender-cvs mailing list