[Bf-blender-cvs] [ecafa4c27c6] master: Compositor: Fix Missing output UI for Normal node
Aaron Carlisle
noreply at git.blender.org
Wed Mar 30 14:01:58 CEST 2022
Commit: ecafa4c27c67bda074217adba81a0d211c764370
Author: Aaron Carlisle
Date: Wed Mar 30 08:00:00 2022 -0400
Branches: master
https://developer.blender.org/rBecafa4c27c67bda074217adba81a0d211c764370
Compositor: Fix Missing output UI for Normal node
There were multiple issues at hand here:
- The default value has been changed to `{0, 0, 1}` see: rB25f1783673de636a6f0ca4457df8c05bc685981a
- The output needs the subtype set `PROP_DIRECTION`
- The noder properties were missing in `node_composit_set_butfunc`
Fixes T96860
===================================================================
M source/blender/editors/space_node/drawnode.cc
M source/blender/nodes/composite/nodes/node_composite_normal.cc
===================================================================
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index d4b7640cfe3..c6839099827 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -791,6 +791,9 @@ static void node_composit_set_butfunc(bNodeType *ntype)
ntype->draw_buttons = node_composit_buts_image;
ntype->draw_buttons_ex = node_composit_buts_image_ex;
break;
+ case CMP_NODE_NORMAL:
+ ntype->draw_buttons = node_buts_normal;
+ break;
case CMP_NODE_CURVE_RGB:
ntype->draw_buttons = node_buts_curvecol;
break;
diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.cc b/source/blender/nodes/composite/nodes/node_composite_normal.cc
index c04e4bed660..b4dd0bbacd0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normal.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_normal.cc
@@ -14,11 +14,15 @@ namespace blender::nodes::node_composite_normal_cc {
static void cmp_node_normal_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Vector>(N_("Normal"))
- .default_value({1.0f, 1.0f, 1.0f})
+ .default_value({0.0f, 0.0f, 1.0f})
+ .min(-1.0f)
+ .max(1.0f)
+ .subtype(PROP_DIRECTION);
+ b.add_output<decl::Vector>(N_("Normal"))
+ .default_value({0.0f, 0.0f, 1.0f})
.min(-1.0f)
.max(1.0f)
.subtype(PROP_DIRECTION);
- b.add_output<decl::Vector>(N_("Normal"));
b.add_output<decl::Float>(N_("Dot"));
}
More information about the Bf-blender-cvs
mailing list