blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

I18n: Remove extraction macros from the node socket declarations #107258

Merged
Bastien Montagne merged 3 commits from pioverfour/blender:dp_geo_nodes_remove_extraction_macros into main 2023-05-16 14:13:01 +02:00
Conversation 6 Commits 3 Files Changed 350 +1935 -2129
350 changed files with 1935 additions and 2129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/modules/bl_i18n_utils/settings.py
View File

@ -256,6 +256,25 @@ PYGETTEXT_KEYWORDS = (() +
tuple(("{}\\((?:[^,]+,){{2}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
for it in ("modifier_subpanel_register", "gpencil_modifier_subpanel_register")) +
# Node socket declarations: contextless names
tuple((r"\.{}<decl::.*?>\(\s*" + _msg_re + r"(?:,[^),]+)*\s*\)").format(it)
Bastien Montagne commented 2023-04-28 18:47:02 +02:00
Outdated
Review
Copy Link

I don't think this will handle properly cases with more than one string passed to the constructor, like in b.add_input<decl::Float>("Value", "Value_001") ?

I don't think this will handle properly cases with more than one string passed to the constructor, like in ` b.add_input<decl::Float>("Value", "Value_001")` ?
Damien Picard commented 2023-04-28 23:55:50 +02:00
Outdated
Review
Copy Link

I don't think this will handle properly cases with more than one string passed to the constructor, like in b.add_input<decl::Float>("Value", "Value_001") ?

My understanding from this block is that the second string is only an identifier and can always be ignored for translation. Also at present, every instance where add_(in|out)put() is called with two arguments, only the first one has a N_() extraction tag.

> I don't think this will handle properly cases with more than one string passed to the constructor, like in ` b.add_input<decl::Float>("Value", "Value_001")` ? My understanding from [this block](https://projects.blender.org/blender/blender/src/branch/main/source/blender/nodes/NOD_node_declaration.hh#L515-L518) is that the second string is only an identifier and can always be ignored for translation. Also at present, every instance where `add_(in|out)put()` is called with two arguments, only the first one has a `N_()` extraction tag.
Hans Goudey commented 2023-05-02 16:20:24 +02:00
Outdated
Review
Copy Link

Yes, that's right

Yes, that's right
Bastien Montagne commented 2023-05-02 18:02:19 +02:00
Outdated
Review
Copy Link

@pioverfour I was not clear enough here, my concern is that the current regex will not match on multi-parameters cases. The r"\s*\)" part of the regex requires zero or more 'space-like' chars and a closing ).

See e.g. how modifier_subpanel_register & co are handled. You probably need to add something like r"(?:,[^),]+)*\s*\)" (or + instead of * if there can ever only be one additional optional parameter) to match & discard any extra parameter...

@pioverfour I was not clear enough here, my concern is that the current regex will not match on multi-parameters cases. The `r"\s*\)"` part of the regex requires zero or more 'space-like' chars and a closing `)`. See e.g. how `modifier_subpanel_register` & co are handled. You probably need to add something like `r"(?:,[^),]+)*\s*\)"` (or `+` instead of `*` if there can ever only be one additional optional parameter) to match & discard any extra parameter...
Damien Picard commented 2023-05-07 16:52:49 +02:00
Outdated
Review
Copy Link

Ah, yes of course! Thanks.

Ah, yes of course! Thanks.
for it in ("add_input", "add_output")) +
# Node socket declarations: names with contexts
tuple((r"\.{}<decl::.*?>\(\s*" + _msg_re + r"[^;]*\.translation_context\(\s*" + _ctxt_re + r"\s*\)").format(it)
for it in ("add_input", "add_output")) +
# Node socket declarations: description and error messages
tuple((r"\.{}\(\s*" + _msg_re + r"\s*\)").format(it)
for it in ("description", "error_message_add")) +
# Node socket labels
tuple((r"{}\(\s*[^,]+,\s*" + _msg_re + r"\s*\)").format(it)
for it in ("node_sock_label",)) +
# Geometry Nodes field inputs
((r"FieldInput\(CPPType::get<.*?>\(\),\s*" + _msg_re + r"\s*\)"),) +
# bUnitDef unit names.
# NOTE: regex is a bit more complex than it would need too. Since the actual
# identifier (`B_UNIT_DEF_`) is at the end, if it's simpler/too general it

8
source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
View File

@ -22,19 +22,19 @@ NODE_STORAGE_FUNCS(NodeTwoFloats)
static void cmp_node_alphaover_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(2);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Image"), "Image_001")
b.add_input<decl::Color>("Image", "Image_001")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_alphaover_init(bNodeTree * /*ntree*/, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
View File

@ -23,10 +23,10 @@ NODE_STORAGE_FUNCS(NodeAntiAliasingData)
static void cmp_node_antialiasing_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_antialiasing(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
View File

@ -25,13 +25,13 @@ NODE_STORAGE_FUNCS(NodeBilateralBlurData)
static void cmp_node_bilateralblur_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Determinator"))
b.add_input<decl::Color>("Determinator")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_bilateralblur(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_blur.cc
View File

@ -34,15 +34,15 @@ NODE_STORAGE_FUNCS(NodeBlurData)
static void cmp_node_blur_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Size"))
b.add_input<decl::Float>("Size")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_blur(bNodeTree * /*ntree*/, bNode *node)

10
source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
View File

@ -24,23 +24,23 @@ namespace blender::nodes::node_composite_bokehblur_cc {
static void cmp_node_bokehblur_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({0.8f, 0.8f, 0.8f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Bokeh"))
b.add_input<decl::Color>("Bokeh")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_skip_realization();
b.add_input<decl::Float>(N_("Size"))
b.add_input<decl::Float>("Size")
.default_value(1.0f)
.min(0.0f)
.max(10.0f)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Bounding box"))
b.add_input<decl::Float>("Bounding box")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(2);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_bokehblur(bNodeTree * /*ntree*/, bNode *node)

2
source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
View File

@ -26,7 +26,7 @@ NODE_STORAGE_FUNCS(NodeBokehImage)
static void cmp_node_bokehimage_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_bokehimage(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_boxmask.cc
View File

@ -27,17 +27,17 @@ NODE_STORAGE_FUNCS(NodeBoxMask)
static void cmp_node_boxmask_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Mask"))
b.add_input<decl::Float>("Mask")
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Value"))
b.add_input<decl::Float>("Value")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(1);
b.add_output<decl::Float>(N_("Mask"));
b.add_output<decl::Float>("Mask");
}
static void node_composit_init_boxmask(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_brightness.cc
View File

@ -20,12 +20,12 @@ namespace blender::nodes::node_composite_brightness_cc {
static void cmp_node_brightcontrast_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Bright")).min(-100.0f).max(100.0f).compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Contrast")).min(-100.0f).max(100.0f).compositor_domain_priority(2);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Float>("Bright").min(-100.0f).max(100.0f).compositor_domain_priority(1);
b.add_input<decl::Float>("Contrast").min(-100.0f).max(100.0f).compositor_domain_priority(2);
b.add_output<decl::Color>("Image");
}
static void node_composit_init_brightcontrast(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
View File

@ -24,11 +24,11 @@ NODE_STORAGE_FUNCS(NodeChroma)
static void cmp_node_channel_matte_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
}
static void node_composit_init_channel_matte(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
View File

@ -26,14 +26,14 @@ NODE_STORAGE_FUNCS(NodeChroma)
static void cmp_node_chroma_matte_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Key Color"))
b.add_input<decl::Color>("Key Color")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
}
static void node_composit_init_chroma_matte(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_color_matte.cc
View File

@ -22,14 +22,14 @@ NODE_STORAGE_FUNCS(NodeChroma)
static void cmp_node_color_matte_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Key Color"))
b.add_input<decl::Color>("Key Color")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
}
static void node_composit_init_color_matte(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_color_spill.cc
View File

@ -24,16 +24,16 @@ NODE_STORAGE_FUNCS(NodeColorspill)
static void cmp_node_color_spill_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_color_spill(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
View File

@ -52,16 +52,16 @@ NODE_STORAGE_FUNCS(NodeColorBalance)
static void cmp_node_colorbalance_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_colorbalance(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
View File

@ -24,15 +24,15 @@ NODE_STORAGE_FUNCS(NodeColorCorrection)
static void cmp_node_colorcorrection_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Mask"))
b.add_input<decl::Float>("Mask")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_colorcorrection(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_composite.cc
View File

@ -25,9 +25,9 @@ namespace blender::nodes::node_composite_composite_cc {
static void cmp_node_composite_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({0.0f, 0.0f, 0.0f, 1.0f});
b.add_input<decl::Float>(N_("Alpha")).default_value(1.0f).min(0.0f).max(1.0f);
b.add_input<decl::Float>(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f);
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);
}
static void node_composit_buts_composite(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

4
source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc
View File

@ -28,10 +28,10 @@ NODE_STORAGE_FUNCS(NodeConvertColorSpace)
static void CMP_NODE_CONVERT_COLOR_SPACE_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_convert_colorspace(bNodeTree * /*ntree*/, bNode *node)

14
source/blender/nodes/composite/nodes/node_composite_cornerpin.cc
View File

@ -25,31 +25,31 @@ namespace blender::nodes::node_composite_cornerpin_cc {
static void cmp_node_cornerpin_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Vector>(N_("Upper Left"))
b.add_input<decl::Vector>("Upper Left")
.default_value({0.0f, 1.0f, 0.0f})
.min(0.0f)
.max(1.0f)
.compositor_expects_single_value();
b.add_input<decl::Vector>(N_("Upper Right"))
b.add_input<decl::Vector>("Upper Right")
.default_value({1.0f, 1.0f, 0.0f})
.min(0.0f)
.max(1.0f)
.compositor_expects_single_value();
b.add_input<decl::Vector>(N_("Lower Left"))
b.add_input<decl::Vector>("Lower Left")
.default_value({0.0f, 0.0f, 0.0f})
.min(0.0f)
.max(1.0f)
.compositor_expects_single_value();
b.add_input<decl::Vector>(N_("Lower Right"))
b.add_input<decl::Vector>("Lower Right")
.default_value({1.0f, 0.0f, 0.0f})
.min(0.0f)
.max(1.0f)
.compositor_expects_single_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Plane"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Plane");
}
using namespace blender::realtime_compositor;

4
source/blender/nodes/composite/nodes/node_composite_crop.cc
View File

@ -31,10 +31,10 @@ NODE_STORAGE_FUNCS(NodeTwoXYs)
static void cmp_node_crop_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_crop(bNodeTree * /*ntree*/, bNode *node)

16
source/blender/nodes/composite/nodes/node_composite_curves.cc
View File

@ -25,7 +25,7 @@ namespace blender::nodes::node_composite_time_curves_cc {
static void cmp_node_time_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Float>(N_("Fac"));
b.add_output<decl::Float>("Fac");
}
/* custom1 = start_frame, custom2 = end_frame */
@ -113,12 +113,12 @@ namespace blender::nodes::node_composite_vector_curves_cc {
static void cmp_node_curve_vec_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Vector>(N_("Vector"))
b.add_input<decl::Vector>("Vector")
.default_value({0.0f, 0.0f, 0.0f})
.min(-1.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_output<decl::Vector>(N_("Vector"));
b.add_output<decl::Vector>("Vector");
}
static void node_composit_init_curve_vec(bNodeTree * /*ntree*/, bNode *node)
@ -208,18 +208,18 @@ namespace blender::nodes::node_composite_rgb_curves_cc {
static void cmp_node_rgbcurves_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(-1.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Black Level")).default_value({0.0f, 0.0f, 0.0f, 1.0f});
b.add_input<decl::Color>(N_("White Level")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Color>("Black Level").default_value({0.0f, 0.0f, 0.0f, 1.0f});
b.add_input<decl::Color>("White Level").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Color>("Image");
}
static void node_composit_init_curve_rgb(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_defocus.cc
View File

@ -24,9 +24,9 @@ namespace blender::nodes::node_composite_defocus_cc {
static void cmp_node_defocus_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>("Z").default_value(1.0f).min(0.0f).max(1.0f);
b.add_output<decl::Color>("Image");
}
static void node_composit_init_defocus(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_denoise.cc
View File

@ -33,20 +33,20 @@ NODE_STORAGE_FUNCS(NodeDenoise)
static void cmp_node_denoise_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Vector>(N_("Normal"))
b.add_input<decl::Vector>("Normal")
.default_value({0.0f, 0.0f, 0.0f})
.min(-1.0f)
.max(1.0f)
.hide_value()
.compositor_domain_priority(2);
b.add_input<decl::Color>(N_("Albedo"))
b.add_input<decl::Color>("Albedo")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.hide_value()
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_denonise(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_despeckle.cc
View File

@ -21,16 +21,16 @@ namespace blender::nodes::node_composite_despeckle_cc {
static void cmp_node_despeckle_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_despeckle(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
View File

@ -22,14 +22,14 @@ NODE_STORAGE_FUNCS(NodeChroma)
static void cmp_node_diff_matte_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image 1"))
b.add_input<decl::Color>("Image 1")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Image 2"))
b.add_input<decl::Color>("Image 2")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
}
static void node_composit_init_diff_matte(bNodeTree * /*ntree*/, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_dilate.cc
View File

@ -32,8 +32,8 @@ NODE_STORAGE_FUNCS(NodeDilateErode)
static void cmp_node_dilate_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Mask")).default_value(0.0f).min(0.0f).max(1.0f);
b.add_output<decl::Float>(N_("Mask"));
b.add_input<decl::Float>("Mask").default_value(0.0f).min(0.0f).max(1.0f);
b.add_output<decl::Float>("Mask");
}
static void node_composit_init_dilateerode(bNodeTree * /*ntree*/, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
View File

@ -24,10 +24,10 @@ NODE_STORAGE_FUNCS(NodeDBlurData)
static void cmp_node_directional_blur_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_dblur(bNodeTree * /*ntree*/, bNode *node)

10
source/blender/nodes/composite/nodes/node_composite_displace.cc
View File

@ -23,26 +23,26 @@ namespace blender::nodes::node_composite_displace_cc {
static void cmp_node_displace_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Vector>(N_("Vector"))
b.add_input<decl::Vector>("Vector")
.default_value({1.0f, 1.0f, 1.0f})
.min(0.0f)
.max(1.0f)
.subtype(PROP_TRANSLATION)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("X Scale"))
b.add_input<decl::Float>("X Scale")
.default_value(0.0f)
.min(-1000.0f)
.max(1000.0f)
.compositor_domain_priority(2);
b.add_input<decl::Float>(N_("Y Scale"))
b.add_input<decl::Float>("Y Scale")
.default_value(0.0f)
.min(-1000.0f)
.max(1000.0f)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

8
source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
View File

@ -22,14 +22,14 @@ NODE_STORAGE_FUNCS(NodeChroma)
static void cmp_node_distance_matte_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Key Color"))
b.add_input<decl::Color>("Key Color")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
}
static void node_composit_init_distance_matte(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc
View File

@ -20,9 +20,9 @@ namespace blender::nodes::node_composite_double_edge_mask_cc {
static void cmp_node_double_edge_mask_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Inner Mask")).default_value(0.8f).min(0.0f).max(1.0f);
b.add_input<decl::Float>(N_("Outer Mask")).default_value(0.8f).min(0.0f).max(1.0f);
b.add_output<decl::Float>(N_("Mask"));
b.add_input<decl::Float>("Inner Mask").default_value(0.8f).min(0.0f).max(1.0f);
b.add_input<decl::Float>("Outer Mask").default_value(0.8f).min(0.0f).max(1.0f);
b.add_output<decl::Float>("Mask");
}
static void node_composit_buts_double_edge_mask(uiLayout *layout,

6
source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
View File

@ -27,17 +27,17 @@ NODE_STORAGE_FUNCS(NodeEllipseMask)
static void cmp_node_ellipsemask_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Mask"))
b.add_input<decl::Float>("Mask")
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Value"))
b.add_input<decl::Float>("Value")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(1);
b.add_output<decl::Float>(N_("Mask"));
b.add_output<decl::Float>("Mask");
}
static void node_composit_init_ellipsemask(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_exposure.cc
View File

@ -17,11 +17,11 @@ namespace blender::nodes::node_composite_exposure_cc {
static void cmp_node_exposure_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Exposure")).min(-10.0f).max(10.0f).compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Float>("Exposure").min(-10.0f).max(10.0f).compositor_domain_priority(1);
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

6
source/blender/nodes/composite/nodes/node_composite_filter.cc
View File

@ -21,16 +21,16 @@ namespace blender::nodes::node_composite_filter_cc {
static void cmp_node_filter_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_filter(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

4
source/blender/nodes/composite/nodes/node_composite_flip.cc
View File

@ -25,10 +25,10 @@ namespace blender::nodes::node_composite_flip_cc {
static void cmp_node_flip_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_flip(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

6
source/blender/nodes/composite/nodes/node_composite_gamma.cc
View File

@ -17,16 +17,16 @@ namespace blender::nodes::node_composite_gamma_cc {
static void cmp_node_gamma_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Gamma"))
b.add_input<decl::Float>("Gamma")
.default_value(1.0f)
.min(0.001f)
.max(10.0f)
.subtype(PROP_UNSIGNED)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

4
source/blender/nodes/composite/nodes/node_composite_glare.cc
View File

@ -42,10 +42,10 @@ NODE_STORAGE_FUNCS(NodeGlare)
static void cmp_node_glare_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_glare(bNodeTree * /*ntree*/, bNode *node)

12
source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc
View File

@ -17,35 +17,35 @@ namespace blender::nodes::node_composite_hue_sat_val_cc {
static void cmp_node_huesatval_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Hue"))
b.add_input<decl::Float>("Hue")
.default_value(0.5f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Saturation"))
b.add_input<decl::Float>("Saturation")
.default_value(1.0f)
.min(0.0f)
.max(2.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(2);
b.add_input<decl::Float>(CTX_N_(BLT_I18NCONTEXT_COLOR, "Value"))
b.add_input<decl::Float>("Value")
.translation_context(BLT_I18NCONTEXT_COLOR)
.default_value(1.0f)
.min(0.0f)
.max(2.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(3);
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(4);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

6
source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
View File

@ -19,16 +19,16 @@ namespace blender::nodes::node_composite_huecorrect_cc {
static void cmp_node_huecorrect_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_huecorrect(bNodeTree * /*ntree*/, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_id_mask.cc
View File

@ -26,12 +26,12 @@ namespace blender::nodes::node_composite_id_mask_cc {
static void cmp_node_idmask_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("ID value"))
b.add_input<decl::Float>("ID value")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Alpha"));
b.add_output<decl::Float>("Alpha");
}
static void node_composit_buts_id_mask(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

4
source/blender/nodes/composite/nodes/node_composite_inpaint.cc
View File

@ -20,8 +20,8 @@ namespace blender::nodes::node_composite_inpaint_cc {
static void cmp_node_inpaint_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_inpaint(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

6
source/blender/nodes/composite/nodes/node_composite_invert.cc
View File

@ -20,16 +20,16 @@ namespace blender::nodes::node_composite_invert_cc {
static void cmp_node_invert_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Color>(N_("Color"))
b.add_input<decl::Color>("Color")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Color"));
b.add_output<decl::Color>("Color");
}
static void node_composit_init_invert(bNodeTree * /*ntree*/, bNode *node)

14
source/blender/nodes/composite/nodes/node_composite_keying.cc
View File

@ -24,13 +24,13 @@ namespace blender::nodes::node_composite_keying_cc {
static void cmp_node_keying_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_input<decl::Color>(N_("Key Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>(N_("Garbage Matte")).hide_value();
b.add_input<decl::Float>(N_("Core Matte")).hide_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Float>(N_("Edges"));
b.add_input<decl::Color>("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_input<decl::Color>("Key Color").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>("Garbage Matte").hide_value();
b.add_input<decl::Float>("Core Matte").hide_value();
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
b.add_output<decl::Float>("Edges");
}
static void node_composit_init_keying(bNodeTree * /*ntree*/, bNode *node)

3
source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
View File

@ -33,8 +33,7 @@ namespace blender::nodes::node_composite_keyingscreen_cc {
static void cmp_node_keyingscreen_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Color>(CTX_N_(BLT_I18NCONTEXT_ID_SCREEN, "Screen"))
.translation_context(BLT_I18NCONTEXT_ID_SCREEN);
b.add_output<decl::Color>("Screen").translation_context(BLT_I18NCONTEXT_ID_SCREEN);
}
static void node_composit_init_keyingscreen(const bContext *C, PointerRNA *ptr)

8
source/blender/nodes/composite/nodes/node_composite_lensdist.cc
View File

@ -36,20 +36,20 @@ NODE_STORAGE_FUNCS(NodeLensDist)
static void cmp_node_lensdist_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Distort"))
b.add_input<decl::Float>("Distort")
.default_value(0.0f)
.min(MINIMUM_DISTORTION)
.max(1.0f)
.compositor_expects_single_value();
b.add_input<decl::Float>(N_("Dispersion"))
b.add_input<decl::Float>("Dispersion")
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.compositor_expects_single_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_lensdist(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_levels.cc
View File

@ -27,11 +27,11 @@ namespace blender::nodes::node_composite_levels_cc {
static void cmp_node_levels_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({0.0f, 0.0f, 0.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Mean"));
b.add_output<decl::Float>(N_("Std Dev"));
b.add_output<decl::Float>("Mean");
b.add_output<decl::Float>("Std Dev");
}
static void node_composit_init_view_levels(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_luma_matte.cc
View File

@ -24,11 +24,11 @@ NODE_STORAGE_FUNCS(NodeChroma)
static void cmp_node_luma_matte_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Matte"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Matte");
}
static void node_composit_init_luma_matte(bNodeTree * /*ntree*/, bNode *node)

12
source/blender/nodes/composite/nodes/node_composite_map_range.cc
View File

@ -20,32 +20,32 @@ namespace blender::nodes::node_composite_map_range_cc {
static void cmp_node_map_range_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Value"))
b.add_input<decl::Float>("Value")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("From Min"))
b.add_input<decl::Float>("From Min")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("From Max"))
b.add_input<decl::Float>("From Max")
.default_value(1.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(2);
b.add_input<decl::Float>(N_("To Min"))
b.add_input<decl::Float>("To Min")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(3);
b.add_input<decl::Float>(N_("To Max"))
b.add_input<decl::Float>("To Max")
.default_value(1.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(4);
b.add_output<decl::Float>(N_("Value"));
b.add_output<decl::Float>("Value");
}
static void node_composit_buts_map_range(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

6
source/blender/nodes/composite/nodes/node_composite_map_uv.cc
View File

@ -24,15 +24,15 @@ namespace blender::nodes::node_composite_map_uv_cc {
static void cmp_node_map_uv_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_skip_realization();
b.add_input<decl::Vector>(N_("UV"))
b.add_input<decl::Vector>("UV")
.default_value({1.0f, 0.0f, 0.0f})
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_map_uv(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

4
source/blender/nodes/composite/nodes/node_composite_map_value.cc
View File

@ -26,12 +26,12 @@ NODE_STORAGE_FUNCS(TexMapping)
static void cmp_node_map_value_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Value"))
b.add_input<decl::Float>("Value")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Value"));
b.add_output<decl::Float>("Value");
}
static void node_composit_init_map_value(bNodeTree * /*ntree*/, bNode *node)

2
source/blender/nodes/composite/nodes/node_composite_mask.cc
View File

@ -28,7 +28,7 @@ NODE_STORAGE_FUNCS(NodeMask)
static void cmp_node_mask_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Float>(N_("Mask"));
b.add_output<decl::Float>("Mask");
}
static void node_composit_init_mask(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_math.cc
View File

@ -19,22 +19,22 @@ namespace blender::nodes::node_composite_math_cc {
static void cmp_node_math_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Value"))
b.add_input<decl::Float>("Value")
.default_value(0.5f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Value"), "Value_001")
b.add_input<decl::Float>("Value", "Value_001")
.default_value(0.5f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Value"), "Value_002")
b.add_input<decl::Float>("Value", "Value_002")
.default_value(0.5f)
.min(-10000.0f)
.max(10000.0f)
.compositor_domain_priority(2);
b.add_output<decl::Float>(N_("Value"));
b.add_output<decl::Float>("Value");
}
using namespace blender::realtime_compositor;

8
source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
View File

@ -21,19 +21,19 @@ namespace blender::nodes::node_composite_mixrgb_cc {
static void cmp_node_mixrgb_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(2);
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Color>(N_("Image"), "Image_001")
b.add_input<decl::Color>("Image", "Image_001")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

12
source/blender/nodes/composite/nodes/node_composite_movieclip.cc
View File

@ -31,12 +31,12 @@ namespace blender::nodes::node_composite_movieclip_cc {
static void cmp_node_movieclip_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Alpha"));
b.add_output<decl::Float>(N_("Offset X"));
b.add_output<decl::Float>(N_("Offset Y"));
b.add_output<decl::Float>(N_("Scale"));
b.add_output<decl::Float>(N_("Angle"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Alpha");
b.add_output<decl::Float>("Offset X");
b.add_output<decl::Float>("Offset Y");
b.add_output<decl::Float>("Scale");
b.add_output<decl::Float>("Angle");
}
static void init(const bContext *C, PointerRNA *ptr)

4
source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
View File

@ -26,8 +26,8 @@ namespace blender::nodes::node_composite_moviedistortion_cc {
static void cmp_node_moviedistortion_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_("Image"));
b.add_input<decl::Color>("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_output<decl::Color>("Image");
}
static void label(const bNodeTree * /*ntree*/, const bNode *node, char *label, int label_maxncpy)

6
source/blender/nodes/composite/nodes/node_composite_normal.cc
View File

@ -17,18 +17,18 @@ namespace blender::nodes::node_composite_normal_cc {
static void cmp_node_normal_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Vector>(N_("Normal"))
b.add_input<decl::Vector>("Normal")
.default_value({0.0f, 0.0f, 1.0f})
.min(-1.0f)
.max(1.0f)
.subtype(PROP_DIRECTION)
.compositor_domain_priority(0);
b.add_output<decl::Vector>(N_("Normal"))
b.add_output<decl::Vector>("Normal")
.default_value({0.0f, 0.0f, 1.0f})
.min(-1.0f)
.max(1.0f)
.subtype(PROP_DIRECTION);
b.add_output<decl::Float>(N_("Dot"));
b.add_output<decl::Float>("Dot");
}
using namespace blender::realtime_compositor;

4
source/blender/nodes/composite/nodes/node_composite_normalize.cc
View File

@ -17,12 +17,12 @@ namespace blender::nodes::node_composite_normalize_cc {
static void cmp_node_normalize_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Value"))
b.add_input<decl::Float>("Value")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Value"));
b.add_output<decl::Float>("Value");
}
using namespace blender::realtime_compositor;

4
source/blender/nodes/composite/nodes/node_composite_pixelate.cc
View File

@ -17,8 +17,8 @@ namespace blender::nodes::node_composite_pixelate_cc {
static void cmp_node_pixelate_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Color"));
b.add_output<decl::Color>(N_("Color"));
b.add_input<decl::Color>("Color");
b.add_output<decl::Color>("Color");
}
using namespace blender::realtime_compositor;

6
source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
View File

@ -41,9 +41,9 @@ NODE_STORAGE_FUNCS(NodePlaneTrackDeformData)
static void cmp_node_planetrackdeform_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).compositor_skip_realization();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Plane"));
b.add_input<decl::Color>("Image").compositor_skip_realization();
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Plane");
}
static void init(const bContext *C, PointerRNA *ptr)

6
source/blender/nodes/composite/nodes/node_composite_posterize.cc
View File

@ -17,15 +17,15 @@ namespace blender::nodes::node_composite_posterize_cc {
static void cmp_node_posterize_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Steps"))
b.add_input<decl::Float>("Steps")
.default_value(8.0f)
.min(2.0f)
.max(1024.0f)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

4
source/blender/nodes/composite/nodes/node_composite_premulkey.cc
View File

@ -20,10 +20,10 @@ namespace blender::nodes::node_composite_premulkey_cc {
static void cmp_node_premulkey_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_premulkey(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

2
source/blender/nodes/composite/nodes/node_composite_rgb.cc
View File

@ -19,7 +19,7 @@ namespace blender::nodes::node_composite_rgb_cc {
static void cmp_node_rgb_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Color>(N_("RGBA")).default_value({0.5f, 0.5f, 0.5f, 1.0f});
b.add_output<decl::Color>("RGBA").default_value({0.5f, 0.5f, 0.5f, 1.0f});
}
using namespace blender::realtime_compositor;

6
source/blender/nodes/composite/nodes/node_composite_rotate.cc
View File

@ -21,16 +21,16 @@ namespace blender::nodes::node_composite_rotate_cc {
static void cmp_node_rotate_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Degr"))
b.add_input<decl::Float>("Degr")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.subtype(PROP_ANGLE)
.compositor_expects_single_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_rotate(bNodeTree * /*ntree*/, bNode *node)

8
source/blender/nodes/composite/nodes/node_composite_scale.cc
View File

@ -25,20 +25,20 @@ namespace blender::nodes::node_composite_scale_cc {
static void cmp_node_scale_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("X"))
b.add_input<decl::Float>("X")
.default_value(1.0f)
.min(0.0001f)
.max(CMP_SCALE_MAX)
.compositor_expects_single_value();
b.add_input<decl::Float>(N_("Y"))
b.add_input<decl::Float>("Y")
.default_value(1.0f)
.min(0.0001f)
.max(CMP_SCALE_MAX)
.compositor_expects_single_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composite_update_scale(bNodeTree *ntree, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_scene_time.cc
View File

@ -11,8 +11,8 @@ namespace blender::nodes {
static void cmp_node_scene_time_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Float>(N_("Seconds"));
b.add_output<decl::Float>(N_("Frame"));
b.add_output<decl::Float>("Seconds");
b.add_output<decl::Float>("Frame");
}
using namespace blender::realtime_compositor;

20
source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc
View File

@ -66,13 +66,13 @@ NODE_STORAGE_FUNCS(NodeCMPCombSepColor)
static void cmp_node_separate_color_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Red"));
b.add_output<decl::Float>(N_("Green"));
b.add_output<decl::Float>(N_("Blue"));
b.add_output<decl::Float>(N_("Alpha"));
b.add_output<decl::Float>("Red");
b.add_output<decl::Float>("Green");
b.add_output<decl::Float>("Blue");
b.add_output<decl::Float>("Alpha");
}
static void cmp_node_separate_color_update(bNodeTree * /*ntree*/, bNode *node)
@ -154,31 +154,31 @@ NODE_STORAGE_FUNCS(NodeCMPCombSepColor)
static void cmp_node_combine_color_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Red"))
b.add_input<decl::Float>("Red")
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Green"))
b.add_input<decl::Float>("Green")
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Blue"))
b.add_input<decl::Float>("Blue")
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(2);
b.add_input<decl::Float>(N_("Alpha"))
b.add_input<decl::Float>("Alpha")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void cmp_node_combine_color_update(bNodeTree * /*ntree*/, bNode *node)

25
source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc
View File

@ -17,13 +17,13 @@ namespace blender::nodes::node_composite_separate_hsva_cc {
static void cmp_node_sephsva_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("H"));
b.add_output<decl::Float>(N_("S"));
b.add_output<decl::Float>(N_("V"));
b.add_output<decl::Float>(N_("A"));
b.add_output<decl::Float>("H");
b.add_output<decl::Float>("S");
b.add_output<decl::Float>("V");
b.add_output<decl::Float>("A");
}
using namespace blender::realtime_compositor;
@ -70,15 +70,12 @@ namespace blender::nodes::node_composite_combine_hsva_cc {
static void cmp_node_combhsva_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("H")).min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>(N_("S")).min(0.0f).max(1.0f).compositor_domain_priority(1);
b.add_input<decl::Float>(N_("V")).min(0.0f).max(1.0f).compositor_domain_priority(2);
b.add_input<decl::Float>(N_("A"))
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Float>("H").min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>("S").min(0.0f).max(1.0f).compositor_domain_priority(1);
b.add_input<decl::Float>("V").min(0.0f).max(1.0f).compositor_domain_priority(2);
b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority(
3);
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

25
source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc
View File

@ -17,13 +17,13 @@ namespace blender::nodes::node_composite_separate_rgba_cc {
static void cmp_node_seprgba_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("R"));
b.add_output<decl::Float>(N_("G"));
b.add_output<decl::Float>(N_("B"));
b.add_output<decl::Float>(N_("A"));
b.add_output<decl::Float>("R");
b.add_output<decl::Float>("G");
b.add_output<decl::Float>("B");
b.add_output<decl::Float>("A");
}
using namespace blender::realtime_compositor;
@ -70,15 +70,12 @@ namespace blender::nodes::node_composite_combine_rgba_cc {
static void cmp_node_combrgba_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("R")).min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>(N_("G")).min(0.0f).max(1.0f).compositor_domain_priority(1);
b.add_input<decl::Float>(N_("B")).min(0.0f).max(1.0f).compositor_domain_priority(2);
b.add_input<decl::Float>(N_("A"))
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Float>("R").min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>("G").min(0.0f).max(1.0f).compositor_domain_priority(1);
b.add_input<decl::Float>("B").min(0.0f).max(1.0f).compositor_domain_priority(2);
b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority(
3);
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

25
source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc
View File

@ -19,13 +19,13 @@ namespace blender::nodes::node_composite_separate_ycca_cc {
static void cmp_node_sepycca_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Y"));
b.add_output<decl::Float>(N_("Cb"));
b.add_output<decl::Float>(N_("Cr"));
b.add_output<decl::Float>(N_("A"));
b.add_output<decl::Float>("Y");
b.add_output<decl::Float>("Cb");
b.add_output<decl::Float>("Cr");
b.add_output<decl::Float>("A");
}
static void node_composit_init_mode_sepycca(bNodeTree * /*ntree*/, bNode *node)
@ -98,23 +98,20 @@ namespace blender::nodes::node_composite_combine_ycca_cc {
static void cmp_node_combycca_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Y")).min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Cb"))
b.add_input<decl::Float>("Y").min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>("Cb")
.default_value(0.5f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Cr"))
b.add_input<decl::Float>("Cr")
.default_value(0.5f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(2);
b.add_input<decl::Float>(N_("A"))
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority(
3);
b.add_output<decl::Color>("Image");
}
static void node_composit_init_mode_combycca(bNodeTree * /*ntree*/, bNode *node)

25
source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc
View File

@ -17,13 +17,13 @@ namespace blender::nodes::node_composite_separate_yuva_cc {
static void cmp_node_sepyuva_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Y"));
b.add_output<decl::Float>(N_("U"));
b.add_output<decl::Float>(N_("V"));
b.add_output<decl::Float>(N_("A"));
b.add_output<decl::Float>("Y");
b.add_output<decl::Float>("U");
b.add_output<decl::Float>("V");
b.add_output<decl::Float>("A");
}
using namespace blender::realtime_compositor;
@ -70,15 +70,12 @@ namespace blender::nodes::node_composite_combine_yuva_cc {
static void cmp_node_combyuva_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Y")).min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>(N_("U")).min(0.0f).max(1.0f).compositor_domain_priority(1);
b.add_input<decl::Float>(N_("V")).min(0.0f).max(1.0f).compositor_domain_priority(2);
b.add_input<decl::Float>(N_("A"))
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Float>("Y").min(0.0f).max(1.0f).compositor_domain_priority(0);
b.add_input<decl::Float>("U").min(0.0f).max(1.0f).compositor_domain_priority(1);
b.add_input<decl::Float>("V").min(0.0f).max(1.0f).compositor_domain_priority(2);
b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority(
3);
b.add_output<decl::Color>("Image");
}
using namespace blender::realtime_compositor;

6
source/blender/nodes/composite/nodes/node_composite_setalpha.cc
View File

@ -22,15 +22,15 @@ NODE_STORAGE_FUNCS(NodeSetAlpha)
static void cmp_node_setalpha_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Alpha"))
b.add_input<decl::Float>("Alpha")
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_setalpha(bNodeTree * /*ntree*/, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_split_viewer.cc
View File

@ -25,8 +25,8 @@ namespace blender::nodes::node_composite_split_viewer_cc {
static void cmp_node_split_viewer_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"));
b.add_input<decl::Color>(N_("Image"), "Image_001");
b.add_input<decl::Color>("Image");
b.add_input<decl::Color>("Image", "Image_001");
}
static void node_composit_init_splitviewer(bNodeTree * /*ntree*/, bNode *node)

4
source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
View File

@ -34,10 +34,10 @@ namespace blender::nodes::node_composite_stabilize2d_cc {
static void cmp_node_stabilize2d_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({0.8f, 0.8f, 0.8f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void init(const bContext *C, PointerRNA *ptr)

4
source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
View File

@ -18,8 +18,8 @@ namespace blender::nodes::node_composite_sunbeams_cc {
static void cmp_node_sunbeams_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Color>("Image");
}
static void init(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_switch.cc
View File

@ -18,9 +18,9 @@ namespace blender::nodes::node_composite_switch_cc {
static void cmp_node_switch_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Off")).default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_input<decl::Color>(N_("On")).default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_output<decl::Color>(N_("Image"));
b.add_input<decl::Color>("Off").default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_input<decl::Color>("On").default_value({0.8f, 0.8f, 0.8f, 1.0f});
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_switch(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

8
source/blender/nodes/composite/nodes/node_composite_texture.cc
View File

@ -19,19 +19,19 @@ namespace blender::nodes::node_composite_texture_cc {
static void cmp_node_texture_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Vector>(N_("Offset"))
b.add_input<decl::Vector>("Offset")
.min(-2.0f)
.max(2.0f)
.subtype(PROP_TRANSLATION)
.compositor_expects_single_value();
b.add_input<decl::Vector>(N_("Scale"))
b.add_input<decl::Vector>("Scale")
.default_value({1.0f, 1.0f, 1.0f})
.min(-10.0f)
.max(10.0f)
.subtype(PROP_XYZ)
.compositor_expects_single_value();
b.add_output<decl::Float>(N_("Value"));
b.add_output<decl::Color>(N_("Color"));
b.add_output<decl::Float>("Value");
b.add_output<decl::Color>("Color");
}
using namespace blender::realtime_compositor;

4
source/blender/nodes/composite/nodes/node_composite_tonemap.cc
View File

@ -31,10 +31,10 @@ NODE_STORAGE_FUNCS(NodeTonemap)
static void cmp_node_tonemap_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_tonemap(bNodeTree * /*ntree*/, bNode *node)

6
source/blender/nodes/composite/nodes/node_composite_trackpos.cc
View File

@ -33,9 +33,9 @@ NODE_STORAGE_FUNCS(NodeTrackPosData)
static void cmp_node_trackpos_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Float>(N_("X"));
b.add_output<decl::Float>(N_("Y"));
b.add_output<decl::Vector>(N_("Speed")).subtype(PROP_VELOCITY);
b.add_output<decl::Float>("X");
b.add_output<decl::Float>("Y");
b.add_output<decl::Vector>("Speed").subtype(PROP_VELOCITY);
}
static void init(const bContext *C, PointerRNA *ptr)

12
source/blender/nodes/composite/nodes/node_composite_transform.cc
View File

@ -22,31 +22,31 @@ namespace blender::nodes::node_composite_transform_cc {
static void cmp_node_transform_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({0.8f, 0.8f, 0.8f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("X"))
b.add_input<decl::Float>("X")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_expects_single_value();
b.add_input<decl::Float>(N_("Y"))
b.add_input<decl::Float>("Y")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_expects_single_value();
b.add_input<decl::Float>(N_("Angle"))
b.add_input<decl::Float>("Angle")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.subtype(PROP_ANGLE)
.compositor_expects_single_value();
b.add_input<decl::Float>(N_("Scale"))
b.add_input<decl::Float>("Scale")
.default_value(1.0f)
.min(0.0001f)
.max(CMP_SCALE_MAX)
.compositor_expects_single_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_buts_transform(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

8
source/blender/nodes/composite/nodes/node_composite_translate.cc
View File

@ -22,20 +22,20 @@ NODE_STORAGE_FUNCS(NodeTranslateData)
static void cmp_node_translate_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("X"))
b.add_input<decl::Float>("X")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_expects_single_value();
b.add_input<decl::Float>(N_("Y"))
b.add_input<decl::Float>("Y")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
.compositor_expects_single_value();
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
static void node_composit_init_translate(bNodeTree * /*ntree*/, bNode *node)

10
source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
View File

@ -25,14 +25,14 @@ namespace blender::nodes::node_composite_color_ramp_cc {
static void cmp_node_valtorgb_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Fac"))
b.add_input<decl::Float>("Fac")
.default_value(0.5f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR)
.compositor_domain_priority(1);
b.add_output<decl::Color>(N_("Image")).compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Alpha"));
b.add_output<decl::Color>("Image").compositor_domain_priority(0);
b.add_output<decl::Float>("Alpha");
}
static void node_composit_init_valtorgb(bNodeTree * /*ntree*/, bNode *node)
@ -151,10 +151,10 @@ namespace blender::nodes::node_composite_rgb_to_bw_cc {
static void cmp_node_rgbtobw_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({0.8f, 0.8f, 0.8f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>(N_("Val"));
b.add_output<decl::Float>("Val");
}
using namespace blender::realtime_compositor;

2
source/blender/nodes/composite/nodes/node_composite_value.cc
View File

@ -15,7 +15,7 @@ namespace blender::nodes::node_composite_value_cc {
static void cmp_node_value_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Float>(N_("Value")).default_value(0.5f);
b.add_output<decl::Float>("Value").default_value(0.5f);
}
using namespace blender::realtime_compositor;

8
source/blender/nodes/composite/nodes/node_composite_vec_blur.cc
View File

@ -20,14 +20,14 @@ namespace blender::nodes::node_composite_vec_blur_cc {
static void cmp_node_vec_blur_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>(N_("Z")).default_value(0.0f).min(0.0f).max(1.0f);
b.add_input<decl::Vector>(N_("Speed"))
b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>("Z").default_value(0.0f).min(0.0f).max(1.0f);
b.add_input<decl::Vector>("Speed")
.default_value({0.0f, 0.0f, 0.0f})
.min(0.0f)
.max(1.0f)
.subtype(PROP_VELOCITY);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Color>("Image");
}
/* custom1: iterations, custom2: max_speed (0 = no_limit). */

6
source/blender/nodes/composite/nodes/node_composite_viewer.cc
View File

@ -30,9 +30,9 @@ namespace blender::nodes::node_composite_viewer_cc {
static void cmp_node_viewer_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image")).default_value({0.0f, 0.0f, 0.0f, 1.0f});
b.add_input<decl::Float>(N_("Alpha")).default_value(1.0f).min(0.0f).max(1.0f);
b.add_input<decl::Float>(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f);
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);
}
static void node_composit_init_viewer(bNodeTree * /*ntree*/, bNode *node)

12
source/blender/nodes/composite/nodes/node_composite_zcombine.cc
View File

@ -28,24 +28,24 @@ namespace blender::nodes::node_composite_zcombine_cc {
static void cmp_node_zcombine_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Color>(N_("Image"))
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>(N_("Z"))
b.add_input<decl::Float>("Z")
.default_value(1.0f)
.min(0.0f)
.max(10000.0f)
.compositor_domain_priority(2);
b.add_input<decl::Color>(N_("Image"), "Image_001")
b.add_input<decl::Color>("Image", "Image_001")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(1);
b.add_input<decl::Float>(N_("Z"), "Z_001")
b.add_input<decl::Float>("Z", "Z_001")
.default_value(1.0f)
.min(0.0f)
.max(10000.0f)
.compositor_domain_priority(3);
b.add_output<decl::Color>(N_("Image"));
b.add_output<decl::Float>(N_("Z"));
b.add_output<decl::Color>("Image");
b.add_output<decl::Float>("Z");
}
static void node_composit_buts_zcombine(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

12
source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
View File

@ -15,14 +15,10 @@ namespace blender::nodes::node_fn_align_euler_to_vector_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER).hide_value();
b.add_input<decl::Float>(N_("Factor"))
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR);
b.add_input<decl::Vector>(N_("Vector")).default_value({0.0, 0.0, 1.0});
b.add_output<decl::Vector>(N_("Rotation")).subtype(PROP_EULER);
b.add_input<decl::Vector>("Rotation").subtype(PROP_EULER).hide_value();
b.add_input<decl::Float>("Factor").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_input<decl::Vector>("Vector").default_value({0.0, 0.0, 1.0});
b.add_output<decl::Vector>("Rotation").subtype(PROP_EULER);
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

6
source/blender/nodes/function/nodes/node_fn_boolean_math.cc
View File

@ -18,9 +18,9 @@ namespace blender::nodes::node_fn_boolean_math_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Bool>(N_("Boolean"), "Boolean");
b.add_input<decl::Bool>(N_("Boolean"), "Boolean_001");
b.add_output<decl::Bool>(N_("Boolean"));
b.add_input<decl::Bool>("Boolean", "Boolean");
b.add_input<decl::Bool>("Boolean", "Boolean_001");
b.add_output<decl::Bool>("Boolean");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

22
source/blender/nodes/function/nodes/node_fn_combine_color.cc
View File

@ -12,23 +12,11 @@ NODE_STORAGE_FUNCS(NodeCombSepColor)
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Float>(N_("Red")).default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_input<decl::Float>(N_("Green"))
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR);
b.add_input<decl::Float>(N_("Blue"))
.default_value(0.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR);
b.add_input<decl::Float>(N_("Alpha"))
.default_value(1.0f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR);
b.add_output<decl::Color>(N_("Color"));
b.add_input<decl::Float>("Red").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_input<decl::Float>("Green").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_input<decl::Float>("Blue").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_input<decl::Float>("Alpha").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_output<decl::Color>("Color");
};
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

28
source/blender/nodes/function/nodes/node_fn_compare.cc
View File

@ -23,26 +23,26 @@ NODE_STORAGE_FUNCS(NodeFunctionCompare)
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Float>(N_("A")).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>(N_("B")).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>("A").min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>("B").min(-10000.0f).max(10000.0f);
b.add_input<decl::Int>(N_("A"), "A_INT");
b.add_input<decl::Int>(N_("B"), "B_INT");
b.add_input<decl::Int>("A", "A_INT");
b.add_input<decl::Int>("B", "B_INT");
b.add_input<decl::Vector>(N_("A"), "A_VEC3");
b.add_input<decl::Vector>(N_("B"), "B_VEC3");
b.add_input<decl::Vector>("A", "A_VEC3");
b.add_input<decl::Vector>("B", "B_VEC3");
b.add_input<decl::Color>(N_("A"), "A_COL");
b.add_input<decl::Color>(N_("B"), "B_COL");
b.add_input<decl::Color>("A", "A_COL");
b.add_input<decl::Color>("B", "B_COL");
b.add_input<decl::String>(N_("A"), "A_STR");
b.add_input<decl::String>(N_("B"), "B_STR");
b.add_input<decl::String>("A", "A_STR");
b.add_input<decl::String>("B", "B_STR");
b.add_input<decl::Float>(N_("C")).default_value(0.9f);
b.add_input<decl::Float>(N_("Angle")).default_value(0.0872665f).subtype(PROP_ANGLE);
b.add_input<decl::Float>(N_("Epsilon")).default_value(0.001).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>("C").default_value(0.9f);
b.add_input<decl::Float>("Angle").default_value(0.0872665f).subtype(PROP_ANGLE);
b.add_input<decl::Float>("Epsilon").default_value(0.001).min(-10000.0f).max(10000.0f);
b.add_output<decl::Bool>(N_("Result"));
b.add_output<decl::Bool>("Result");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

4
source/blender/nodes/function/nodes/node_fn_float_to_int.cc
View File

@ -18,8 +18,8 @@ namespace blender::nodes::node_fn_float_to_int_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Float>(N_("Float"));
b.add_output<decl::Int>(N_("Integer"));
b.add_input<decl::Float>("Float");
b.add_output<decl::Int>("Integer");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

2
source/blender/nodes/function/nodes/node_fn_input_bool.cc
View File

@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_bool_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Bool>(N_("Boolean"));
b.add_output<decl::Bool>("Boolean");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

2
source/blender/nodes/function/nodes/node_fn_input_color.cc
View File

@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_color_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Color>(N_("Color"));
b.add_output<decl::Color>("Color");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

2
source/blender/nodes/function/nodes/node_fn_input_int.cc
View File

@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_int_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Int>(N_("Integer"));
b.add_output<decl::Int>("Integer");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

5
source/blender/nodes/function/nodes/node_fn_input_special_characters.cc
View File

@ -6,9 +6,8 @@ namespace blender::nodes::node_fn_input_special_characters_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::String>(N_("Line Break"));
b.add_output<decl::String>(CTX_N_(BLT_I18NCONTEXT_ID_TEXT, "Tab"))
.translation_context(BLT_I18NCONTEXT_ID_TEXT);
b.add_output<decl::String>("Line Break");
b.add_output<decl::String>("Tab").translation_context(BLT_I18NCONTEXT_ID_TEXT);
}
class MF_SpecialCharacters : public mf::MultiFunction {

2
source/blender/nodes/function/nodes/node_fn_input_string.cc
View File

@ -10,7 +10,7 @@ namespace blender::nodes::node_fn_input_string_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_output<decl::String>(N_("String"));
b.add_output<decl::String>("String");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

2
source/blender/nodes/function/nodes/node_fn_input_vector.cc
View File

@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_vector_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Vector>(N_("Vector"));
b.add_output<decl::Vector>("Vector");
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

26
source/blender/nodes/function/nodes/node_fn_random_value.cc
View File

@ -16,30 +16,30 @@ NODE_STORAGE_FUNCS(NodeRandomValue)
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Vector>(N_("Min")).supports_field();
b.add_input<decl::Vector>(N_("Max")).default_value({1.0f, 1.0f, 1.0f}).supports_field();
b.add_input<decl::Float>(N_("Min"), "Min_001").supports_field();
b.add_input<decl::Float>(N_("Max"), "Max_001").default_value(1.0f).supports_field();
b.add_input<decl::Int>(N_("Min"), "Min_002").min(-100000).max(100000).supports_field();
b.add_input<decl::Int>(N_("Max"), "Max_002")
b.add_input<decl::Vector>("Min").supports_field();
b.add_input<decl::Vector>("Max").default_value({1.0f, 1.0f, 1.0f}).supports_field();
b.add_input<decl::Float>("Min", "Min_001").supports_field();
b.add_input<decl::Float>("Max", "Max_001").default_value(1.0f).supports_field();
b.add_input<decl::Int>("Min", "Min_002").min(-100000).max(100000).supports_field();
b.add_input<decl::Int>("Max", "Max_002")
.default_value(100)
.min(-100000)
.max(100000)
.supports_field();
b.add_input<decl::Float>(N_("Probability"))
b.add_input<decl::Float>("Probability")
.min(0.0f)
.max(1.0f)
.default_value(0.5f)
.subtype(PROP_FACTOR)
.supports_field()
.make_available([](bNode &node) { node_storage(node).data_type = CD_PROP_BOOL; });
b.add_input<decl::Int>(N_("ID")).implicit_field(implicit_field_inputs::id_or_index);
b.add_input<decl::Int>(N_("Seed")).default_value(0).min(-10000).max(10000).supports_field();
b.add_input<decl::Int>("ID").implicit_field(implicit_field_inputs::id_or_index);
b.add_input<decl::Int>("Seed").default_value(0).min(-10000).max(10000).supports_field();
b.add_output<decl::Vector>(N_("Value")).dependent_field();
b.add_output<decl::Float>(N_("Value"), "Value_001").dependent_field();
b.add_output<decl::Int>(N_("Value"), "Value_002").dependent_field();
b.add_output<decl::Bool>(N_("Value"), "Value_003").dependent_field();
b.add_output<decl::Vector>("Value").dependent_field();
b.add_output<decl::Float>("Value", "Value_001").dependent_field();
b.add_output<decl::Int>("Value", "Value_002").dependent_field();
b.add_output<decl::Bool>("Value", "Value_003").dependent_field();
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

9
source/blender/nodes/function/nodes/node_fn_replace_string.cc
View File

@ -8,11 +8,10 @@ namespace blender::nodes::node_fn_replace_string_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::String>(N_("String"));
b.add_input<decl::String>(N_("Find")).description(N_("The string to find in the input string"));
b.add_input<decl::String>(N_("Replace"))
.description(N_("The string to replace each match with"));
b.add_output<decl::String>(N_("String"));
b.add_input<decl::String>("String");
b.add_input<decl::String>("Find").description("The string to find in the input string");
b.add_input<decl::String>("Replace").description("The string to replace each match with");
b.add_output<decl::String>("String");
}
static std::string replace_all(const StringRefNull str,

10
source/blender/nodes/function/nodes/node_fn_rotate_euler.cc
View File

@ -20,16 +20,16 @@ static void node_declare(NodeDeclarationBuilder &b)
};
b.is_function_node();
b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER).hide_value();
b.add_input<decl::Vector>(N_("Rotate By")).subtype(PROP_EULER).make_available([](bNode &node) {
b.add_input<decl::Vector>("Rotation").subtype(PROP_EULER).hide_value();
b.add_input<decl::Vector>("Rotate By").subtype(PROP_EULER).make_available([](bNode &node) {
node.custom1 = FN_NODE_ROTATE_EULER_TYPE_EULER;
});
b.add_input<decl::Vector>(N_("Axis"))
b.add_input<decl::Vector>("Axis")
.default_value({0.0, 0.0, 1.0})
.subtype(PROP_XYZ)
.make_available(enable_axis_angle);
b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE).make_available(enable_axis_angle);
b.add_output<decl::Vector>(N_("Rotation"));
b.add_input<decl::Float>("Angle").subtype(PROP_ANGLE).make_available(enable_axis_angle);
b.add_output<decl::Vector>("Rotation");
}
static void node_update(bNodeTree *ntree, bNode *node)

10
source/blender/nodes/function/nodes/node_fn_separate_color.cc
View File

@ -12,11 +12,11 @@ NODE_STORAGE_FUNCS(NodeCombSepColor)
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Color>(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Float>(N_("Red"));
b.add_output<decl::Float>(N_("Green"));
b.add_output<decl::Float>(N_("Blue"));
b.add_output<decl::Float>(N_("Alpha"));
b.add_input<decl::Color>("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_output<decl::Float>("Red");
b.add_output<decl::Float>("Green");
b.add_output<decl::Float>("Blue");
b.add_output<decl::Float>("Alpha");
};
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)

8
source/blender/nodes/function/nodes/node_fn_slice_string.cc
View File

@ -8,10 +8,10 @@ namespace blender::nodes::node_fn_slice_string_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::String>(N_("String"));
b.add_input<decl::Int>(N_("Position"));
b.add_input<decl::Int>(N_("Length")).min(0).default_value(10);
b.add_output<decl::String>(N_("String"));
b.add_input<decl::String>("String");
b.add_input<decl::Int>("Position");
b.add_input<decl::Int>("Length").min(0).default_value(10);
b.add_output<decl::String>("String");
}
static void node_build_multi_function(NodeMultiFunctionBuilder &builder)

4
source/blender/nodes/function/nodes/node_fn_string_length.cc
View File

@ -10,8 +10,8 @@ namespace blender::nodes::node_fn_string_length_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::String>(N_("String"));
b.add_output<decl::Int>(N_("Length"));
b.add_input<decl::String>("String");
b.add_output<decl::Int>("Length");
}
static void node_build_multi_function(NodeMultiFunctionBuilder &builder)

Some files were not shown because too many files have changed in this diff Show More