diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-10-29 17:41:08 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-10-29 17:41:08 +0300 |
| commit | 2383628ee11b6e90d34cd010f742c6d0356f5e11 (patch) | |
| tree | b79add5831068a45bdf11e0638aeede63bf0d300 | |
| parent | 7e94499bb3bb64170f826471a86ce0f957eab3a3 (diff) | |
Nodes: Add translation markers to new socket names and descriptions
As part of the refactor to the node declaration builders, we had hoped
to add a regular expression specifically for these socket names, but
recent discussions have revealed that using the translation marker
macros is the preferred solution.
If the names and descriptions were exposed to RNA, these would not
be necessary. However, that may be quite complicated, since sockets
are all instances of the same RNA types.
Differential Revision: https://developer.blender.org/D13033
201 files changed, 1172 insertions, 1056 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index 3a4bf94d256..3f8a7606d94 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -29,7 +29,7 @@ namespace blender::nodes { static void cmp_node_bokehimage_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Color>("Image"); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index ad4b09c69d0..028afad3cf8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -29,10 +29,10 @@ namespace blender::nodes { static void cmp_node_brightcontrast_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Bright").min(-100.0f).max(100.0f); - b.add_input<decl::Float>("Contrast").min(-100.0f).max(100.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Bright")).min(-100.0f).max(100.0f); + b.add_input<decl::Float>(N_("Contrast")).min(-100.0f).max(100.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index 440e37fe741..ef8af5f81a6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_colorbalance_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 0682c66f1e8..095fbef826a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_colorcorrection_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Mask").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Mask")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc index 170fecb251c..4247e81e9b2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.cc +++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_composite_declare(NodeDeclarationBuilder &b) { - 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); + 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); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc index 88d96e1ca4a..5f99bb57768 100644 --- a/source/blender/nodes/composite/nodes/node_composite_curves.cc +++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc @@ -29,7 +29,7 @@ namespace blender::nodes { static void cmp_node_time_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Fac"); + b.add_output<decl::Float>(N_("Fac")); } } // namespace blender::nodes @@ -90,11 +90,12 @@ namespace blender::nodes { static void cmp_node_rgbcurves_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Fac").default_value(1.0f).min(-1.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - 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"); + b.add_input<decl::Float>(N_("Fac")).default_value(1.0f).min(-1.0f).max(1.0f).subtype( + PROP_FACTOR); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + 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")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc index fd959376afe..c1e64065f7e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc +++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_exposure_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Exposure").min(-10.0f).max(10.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Exposure")).min(-10.0f).max(10.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.cc b/source/blender/nodes/composite/nodes/node_composite_gamma.cc index a29a001688a..74152a27485 100644 --- a/source/blender/nodes/composite/nodes/node_composite_gamma.cc +++ b/source/blender/nodes/composite/nodes/node_composite_gamma.cc @@ -29,10 +29,13 @@ namespace blender::nodes { static void cmp_node_gamma_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Gamma").default_value(1.0f).min(0.001f).max(10.0f).subtype( - PROP_UNSIGNED); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Gamma")) + .default_value(1.0f) + .min(0.001f) + .max(10.0f) + .subtype(PROP_UNSIGNED); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.cc b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.cc index 07746918a94..21430035465 100644 --- a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.cc +++ b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.cc @@ -29,16 +29,20 @@ namespace blender::nodes { static void cmp_node_huesatval_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Hue").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Float>("Saturation") + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Hue")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Float>(N_("Saturation")) .default_value(1.0f) .min(0.0f) .max(2.0f) .subtype(PROP_FACTOR); - b.add_input<decl::Float>("Value").default_value(1.0f).min(0.0f).max(2.0f).subtype(PROP_FACTOR); - b.add_input<decl::Float>("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("Value")) + .default_value(1.0f) + .min(0.0f) + .max(2.0f) + .subtype(PROP_FACTOR); + b.add_input<decl::Float>(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc index 39014896a7b..83743bbed18 100644 --- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc +++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void cmp_node_huecorrect_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_idMask.cc b/source/blender/nodes/composite/nodes/node_composite_idMask.cc index de011dd6274..5121370567c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_idMask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_idMask.cc @@ -29,8 +29,8 @@ namespace blender::nodes { static void cmp_node_idmask_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("ID value").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Float>("Alpha"); + b.add_input<decl::Float>(N_("ID value")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Float>(N_("Alpha")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc index 57b7ed36ccd..dabf0452628 100644 --- a/source/blender/nodes/composite/nodes/node_composite_invert.cc +++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_invert_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Color>("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Color>("Color"); + b.add_input<decl::Float>(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Color>(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output<decl::Color>(N_("Color")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc index aaab8dcc874..54064f24e0d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_levels.cc +++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_levels_declare(NodeDeclarationBuilder &b) { - 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"); + b.add_input<decl::Color>(N_("Image")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_output<decl::Float>(N_("Mean")); + b.add_output<decl::Float>(N_("Std Dev")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc index 8b415bb8b63..6428fadaa5f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc @@ -31,7 +31,7 @@ namespace blender::nodes { static void cmp_node_mask_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Mask"); + b.add_output<decl::Float>(N_("Mask")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc index ae91212f811..5d63a1b8002 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc @@ -30,12 +30,12 @@ namespace blender::nodes { static void cmp_node_movieclip_declare(NodeDeclarationBuilder &b) { - 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"); + 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")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc index e557854c611..49068429a8d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc +++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc @@ -29,8 +29,8 @@ namespace blender::nodes { static void cmp_node_premulkey_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_rgb.cc index 332e56e26b1..abe69d6a756 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rgb.cc @@ -29,7 +29,7 @@ namespace blender::nodes { static void cmp_node_rgb_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Color>("RGBA").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output<decl::Color>(N_("RGBA")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.cc b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.cc index aa719a99b36..83c54069658 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.cc @@ -29,11 +29,11 @@ namespace blender::nodes { static void cmp_node_sephsva_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Float>("H"); - b.add_output<decl::Float>("S"); - b.add_output<decl::Float>("V"); - b.add_output<decl::Float>("A"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + 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")); } } // namespace blender::nodes @@ -53,11 +53,11 @@ namespace blender::nodes { static void cmp_node_combhsva_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("H").min(0.0f).max(1.0f); - b.add_input<decl::Float>("S").min(0.0f).max(1.0f); - b.add_input<decl::Float>("V").min(0.0f).max(1.0f); - b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("H")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("S")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("V")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("A")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.cc b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.cc index b29af1359f5..049e798af0a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.cc @@ -28,11 +28,11 @@ namespace blender::nodes { static void cmp_node_seprgba_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Float>("R"); - b.add_output<decl::Float>("G"); - b.add_output<decl::Float>("B"); - b.add_output<decl::Float>("A"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + 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")); } } // namespace blender::nodes @@ -53,11 +53,11 @@ namespace blender::nodes { static void cmp_node_combrgba_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("R").min(0.0f).max(1.0f); - b.add_input<decl::Float>("G").min(0.0f).max(1.0f); - b.add_input<decl::Float>("B").min(0.0f).max(1.0f); - b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("R")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("G")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("B")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("A")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc index 526d6b4eb5b..eaf6ba5e9b2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc @@ -29,11 +29,11 @@ namespace blender::nodes { static void cmp_node_sepycca_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Float>("Y"); - b.add_output<decl::Float>("Cb"); - b.add_output<decl::Float>("Cr"); - b.add_output<decl::Float>("A"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + 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")); } } // namespace blender::nodes @@ -60,11 +60,11 @@ namespace blender::nodes { static void cmp_node_combycca_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Y").min(0.0f).max(1.0f); - b.add_input<decl::Float>("Cb").default_value(0.5f).min(0.0f).max(1.0f); - b.add_input<decl::Float>("Cr").default_value(0.5f).min(0.0f).max(1.0f); - b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("Y")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("Cb")).default_value(0.5f).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("Cr")).default_value(0.5f).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("A")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.cc b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.cc index 4619b0c97f1..bc7710122d1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.cc @@ -29,11 +29,11 @@ namespace blender::nodes { static void cmp_node_sepyuva_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Float>("Y"); - b.add_output<decl::Float>("U"); - b.add_output<decl::Float>("V"); - b.add_output<decl::Float>("A"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + 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")); } } // namespace blender::nodes @@ -54,11 +54,11 @@ namespace blender::nodes { static void cmp_node_combyuva_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Y").min(0.0f).max(1.0f); - b.add_input<decl::Float>("U").min(0.0f).max(1.0f); - b.add_input<decl::Float>("V").min(0.0f).max(1.0f); - b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("Y")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("U")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("V")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("A")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index 07a7ffcb426..f59ba76f0c5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_setalpha_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Alpha").default_value(1.0f).min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Alpha")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.cc b/source/blender/nodes/composite/nodes/node_composite_texture.cc index eff008b4b41..55ae6a4185e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_texture.cc +++ b/source/blender/nodes/composite/nodes/node_composite_texture.cc @@ -29,14 +29,14 @@ namespace blender::nodes { static void cmp_node_texture_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Vector>("Offset").min(-2.0f).max(2.0f).subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Scale") + b.add_input<decl::Vector>(N_("Offset")).min(-2.0f).max(2.0f).subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Scale")) .default_value({1.0f, 1.0f, 1.0f}) .min(-10.0f) .max(10.0f) .subtype(PROP_XYZ); - b.add_output<decl::Float>("Value"); - b.add_output<decl::Color>("Color"); + b.add_output<decl::Float>(N_("Value")); + b.add_output<decl::Color>(N_("Color")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc index 85fd240ce2e..33d6f98201c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc +++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc @@ -27,8 +27,8 @@ namespace blender::nodes { static void cmp_node_tonemap_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output<decl::Color>(N_("Image")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc index cb5c9468daa..537f7e661db 100644 --- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc +++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void cmp_node_trackpos_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("X"); - b.add_output<decl::Float>("Y"); - b.add_output<decl::Vector>("Speed").subtype(PROP_VELOCITY); + b.add_output<decl::Float>(N_("X")); + b.add_output<decl::Float>(N_("Y")); + b.add_output<decl::Vector>(N_("Speed")).subtype(PROP_VELOCITY); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_valToRgb.cc b/source/blender/nodes/composite/nodes/node_composite_valToRgb.cc index 9e4f1329fbd..a0ab056e657 100644 --- a/source/blender/nodes/composite/nodes/node_composite_valToRgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_valToRgb.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void cmp_node_valtorgb_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Fac").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output<decl::Color>("Image"); - b.add_output<decl::Float>("Alpha"); + b.add_input<decl::Float>(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output<decl::Color>(N_("Image")); + b.add_output<decl::Float>(N_("Alpha")); } } // namespace blender::nodes @@ -60,8 +60,8 @@ namespace blender::nodes { static void cmp_node_rgbtobw_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output<decl::Color>("Val"); + b.add_input<decl::Color>(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output<decl::Color>(N_("Val")); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_value.cc b/source/blender/nodes/composite/nodes/node_composite_value.cc index 5459801bcc7..51214d23472 100644 --- a/source/blender/nodes/composite/nodes/node_composite_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_value.cc @@ -29,7 +29,7 @@ namespace blender::nodes { static void cmp_node_value_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Value").default_value(0.5f); + b.add_output<decl::Float>(N_("Value")).default_value(0.5f); } } // namespace blender::nodes diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index 7234d4d8eb2..b86ae57f664 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -32,9 +32,9 @@ namespace blender::nodes { static void cmp_node_viewer_declare(NodeDeclarationBuilder &b) { - 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); + 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); } } // namespace blender::nodes diff --git a/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc b/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc index 7f6f554ba93..d98d49c7273 100644 --- a/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc +++ b/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc @@ -23,10 +23,10 @@ namespace blender::nodes { static void fn_node_legacy_random_float_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Min").min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Max").default_value(1.0f).min(-10000.0f).max(10000.0f); - b.add_input<decl::Int>("Seed").min(-10000).max(10000); - b.add_output<decl::Float>("Value"); + b.add_input<decl::Float>(N_("Min")).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f); + b.add_input<decl::Int>(N_("Seed")).min(-10000).max(10000); + b.add_output<decl::Float>(N_("Value")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc index ae41cdfca5a..4088fa24ca7 100644 --- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc @@ -28,10 +28,14 @@ namespace blender::nodes { static void fn_node_align_euler_to_vector_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - 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); + 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); } static void fn_node_align_euler_to_vector_layout(uiLayout *layout, diff --git a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc index 09caf12e425..b44e8d54ff1 100644 --- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc +++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void fn_node_boolean_math_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Bool>("Boolean", "Boolean"); - b.add_input<decl::Bool>("Boolean", "Boolean_001"); - b.add_output<decl::Bool>("Boolean"); + b.add_input<decl::Bool>(N_("Boolean"), "Boolean"); + b.add_input<decl::Bool>(N_("Boolean"), "Boolean_001"); + b.add_output<decl::Bool>(N_("Boolean")); }; static void fn_node_boolean_math_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_float_compare.cc b/source/blender/nodes/function/nodes/node_fn_float_compare.cc index bdc4a3c1e02..2e1f2aaeeef 100644 --- a/source/blender/nodes/function/nodes/node_fn_float_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_float_compare.cc @@ -31,10 +31,10 @@ namespace blender::nodes { static void fn_node_float_compare_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - 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::Float>("Epsilon").default_value(0.001f).min(-10000.0f).max(10000.0f); - b.add_output<decl::Bool>("Result"); + 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>(N_("Epsilon")).default_value(0.001f).min(-10000.0f).max(10000.0f); + b.add_output<decl::Bool>(N_("Result")); }; static void geo_node_float_compare_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc index 5dccd26158b..e6ec925f945 100644 --- a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc @@ -30,8 +30,8 @@ namespace blender::nodes { static void fn_node_float_to_int_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Float"); - b.add_output<decl::Int>("Integer"); + b.add_input<decl::Float>(N_("Float")); + b.add_output<decl::Int>(N_("Integer")); }; static void fn_node_float_to_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_input_bool.cc b/source/blender/nodes/function/nodes/node_fn_input_bool.cc index 58f8969f1b6..1358bf8a223 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc @@ -25,7 +25,7 @@ namespace blender::nodes { static void fn_node_input_bool_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Bool>("Boolean"); + b.add_output<decl::Bool>(N_("Boolean")); }; static void fn_node_input_bool_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_input_color.cc b/source/blender/nodes/function/nodes/node_fn_input_color.cc index b6079835eae..43bb654b776 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc @@ -23,7 +23,7 @@ namespace blender::nodes { static void fn_node_input_color_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Color>("Color"); + b.add_output<decl::Color>(N_("Color")); }; static void fn_node_input_color_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_input_int.cc b/source/blender/nodes/function/nodes/node_fn_input_int.cc index db52d569ac5..ddbb86e2661 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc @@ -25,7 +25,7 @@ namespace blender::nodes { static void fn_node_input_int_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Int>("Integer"); + b.add_output<decl::Int>(N_("Integer")); }; static void fn_node_input_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc b/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc index 11c64d3f694..c61af419e50 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc @@ -20,8 +20,8 @@ namespace blender::nodes { static void fn_node_input_special_characters_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::String>("Line Break"); - b.add_output<decl::String>("Tab"); + b.add_output<decl::String>(N_("Line Break")); + b.add_output<decl::String>(N_("Tab")); }; class MF_SpecialCharacters : public fn::MultiFunction { diff --git a/source/blender/nodes/function/nodes/node_fn_input_string.cc b/source/blender/nodes/function/nodes/node_fn_input_string.cc index 0982096eaea..dd2d1292601 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_string.cc @@ -24,7 +24,7 @@ namespace blender::nodes { static void fn_node_input_string_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_output<decl::String>("String"); + b.add_output<decl::String>(N_("String")); }; static void fn_node_input_string_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_input_vector.cc b/source/blender/nodes/function/nodes/node_fn_input_vector.cc index f64fd182282..1e5fd186b5a 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_vector.cc @@ -25,7 +25,7 @@ namespace blender::nodes { static void fn_node_input_vector_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Vector>("Vector"); + b.add_output<decl::Vector>(N_("Vector")); }; static void fn_node_input_vector_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_random_value.cc b/source/blender/nodes/function/nodes/node_fn_random_value.cc index 53ca77aab0c..d48b9f3461a 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_value.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_value.cc @@ -26,29 +26,29 @@ namespace blender::nodes { static void fn_node_random_value_declare(NodeDeclarationBuilder &b) { - 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") + 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") .default_value(100) .min(-100000) .max(100000) .supports_field(); - b.add_input<decl::Float>("Probability") + b.add_input<decl::Float>(N_("Probability")) .min(0.0f) .max(1.0f) .default_value(0.5f) .subtype(PROP_FACTOR) .supports_field(); - b.add_input<decl::Int>("ID").implicit_field(); - b.add_input<decl::Int>("Seed").default_value(0).min(-10000).max(10000).supports_field(); + b.add_input<decl::Int>(N_("ID")).implicit_field(); + b.add_input<decl::Int>(N_("Seed")).default_value(0).min(-10000).max(10000).supports_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(); + 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(); } static void fn_node_random_value_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_replace_string.cc b/source/blender/nodes/function/nodes/node_fn_replace_string.cc index 1ec4979176e..881a3c68e7d 100644 --- a/source/blender/nodes/function/nodes/node_fn_replace_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_replace_string.cc @@ -22,10 +22,11 @@ namespace blender::nodes { static void fn_node_replace_string_declare(NodeDeclarationBuilder &b) { - 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"); + 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")); }; static std::string replace_all(std::string str, const std::string &from, const std::string &to) diff --git a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc index a01cc6b58dd..fc4c3d8221f 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -29,11 +29,11 @@ namespace blender::nodes { static void fn_node_rotate_euler_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Rotation").subtype(PROP_EULER).hide_value(); - b.add_input<decl::Vector>("Rotate By").subtype(PROP_EULER); - b.add_input<decl::Vector>("Axis").default_value({0.0, 0.0, 1.0}).subtype(PROP_XYZ); - b.add_input<decl::Float>("Angle").subtype(PROP_ANGLE); - b.add_output<decl::Vector>("Rotation"); + b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER).hide_value(); + b.add_input<decl::Vector>(N_("Rotate By")).subtype(PROP_EULER); + b.add_input<decl::Vector>(N_("Axis")).default_value({0.0, 0.0, 1.0}).subtype(PROP_XYZ); + b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE); + b.add_output<decl::Vector>(N_("Rotation")); }; static void fn_node_rotate_euler_update(bNodeTree *UNUSED(ntree), bNode *node) diff --git a/source/blender/nodes/function/nodes/node_fn_slice_string.cc b/source/blender/nodes/function/nodes/node_fn_slice_string.cc index 08e17da0d92..5cb753e8f34 100644 --- a/source/blender/nodes/function/nodes/node_fn_slice_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_slice_string.cc @@ -22,10 +22,10 @@ namespace blender::nodes { static void fn_node_slice_string_declare(NodeDeclarationBuilder &b) { - 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"); + 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")); }; static void fn_node_slice_string_build_multi_function(NodeMultiFunctionBuilder &builder) diff --git a/source/blender/nodes/function/nodes/node_fn_string_length.cc b/source/blender/nodes/function/nodes/node_fn_string_length.cc index d882280b566..63429d35993 100644 --- a/source/blender/nodes/function/nodes/node_fn_string_length.cc +++ b/source/blender/nodes/function/nodes/node_fn_string_length.cc @@ -24,8 +24,8 @@ namespace blender::nodes { static void fn_node_string_length_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::String>("String"); - b.add_output<decl::Int>("Length"); + b.add_input<decl::String>(N_("String")); + b.add_output<decl::Int>(N_("Length")); }; static void fn_node_string_length_build_multi_function(NodeMultiFunctionBuilder &builder) diff --git a/source/blender/nodes/function/nodes/node_fn_value_to_string.cc b/source/blender/nodes/function/nodes/node_fn_value_to_string.cc index 112726f98dc..96a56760664 100644 --- a/source/blender/nodes/function/nodes/node_fn_value_to_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_value_to_string.cc @@ -21,9 +21,9 @@ namespace blender::nodes { static void fn_node_value_to_string_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Value"); - b.add_input<decl::Int>("Decimals").min(0); - b.add_output<decl::String>("String"); + b.add_input<decl::Float>(N_("Value")); + b.add_input<decl::Int>(N_("Decimals")).min(0); + b.add_output<decl::String>(N_("String")); }; static void fn_node_value_to_string_build_multi_function(NodeMultiFunctionBuilder &builder) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_align_rotation_to_vector.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_align_rotation_to_vector.cc index d0bb906e8af..b92d4704d63 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_align_rotation_to_vector.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_align_rotation_to_vector.cc @@ -26,18 +26,18 @@ namespace blender::nodes { static void geo_node_align_rotation_to_vector_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Factor"); - b.add_input<decl::Float>("Factor", "Factor_001") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Factor")); + b.add_input<decl::Float>(N_("Factor"), "Factor_001") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input<decl::String>("Vector"); - b.add_input<decl::Vector>("Vector", "Vector_001") + b.add_input<decl::String>(N_("Vector")); + b.add_input<decl::Vector>(N_("Vector"), "Vector_001") .default_value({0.0, 0.0, 1.0}) .subtype(PROP_ANGLE); - b.add_output<decl::Geometry>("Geometry"); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_align_rotation_to_vector_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc index 2e931a2da98..91ff114a480 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc @@ -24,18 +24,18 @@ namespace blender::nodes { static void geo_node_attribute_clamp_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute"); - b.add_input<decl::String>("Result"); - b.add_input<decl::Vector>("Min"); - b.add_input<decl::Vector>("Max").default_value({1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Min", "Min_001"); - b.add_input<decl::Float>("Max", "Max_001").default_value(1.0f); - b.add_input<decl::Int>("Min", "Min_002").min(-100000).max(100000); - b.add_input<decl::Int>("Max", "Max_002").default_value(100).min(-100000).max(100000); - b.add_input<decl::Color>("Min", "Min_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_input<decl::Color>("Max", "Max_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")); + b.add_input<decl::String>(N_("Result")); + b.add_input<decl::Vector>(N_("Min")); + b.add_input<decl::Vector>(N_("Max")).default_value({1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Min"), "Min_001"); + b.add_input<decl::Float>(N_("Max"), "Max_001").default_value(1.0f); + b.add_input<decl::Int>(N_("Min"), "Min_002").min(-100000).max(100000); + b.add_input<decl::Int>(N_("Max"), "Max_002").default_value(100).min(-100000).max(100000); + b.add_input<decl::Color>(N_("Min"), "Min_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_input<decl::Color>(N_("Max"), "Max_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_clamp_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc index aa054af3acd..ab4b6aad545 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc @@ -27,10 +27,10 @@ namespace blender::nodes { static void geo_node_attribute_color_ramp_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_color_ramp_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc index 569d5a824ca..d4c23380b4e 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc @@ -23,15 +23,15 @@ namespace blender::nodes { static void geo_node_attribute_combine_xyz_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("X"); - b.add_input<decl::Float>("X", "X_001"); - b.add_input<decl::String>("Y"); - b.add_input<decl::Float>("Y", "Y_001"); - b.add_input<decl::String>("Z"); - b.add_input<decl::Float>("Z", "Z_001"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("X")); + b.add_input<decl::Float>(N_("X"), "X_001"); + b.add_input<decl::String>(N_("Y")); + b.add_input<decl::Float>(N_("Y"), "Y_001"); + b.add_input<decl::String>(N_("Z")); + b.add_input<decl::Float>(N_("Z"), "Z_001"); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_combine_xyz_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc index 0b9708dae14..e4e43a7b724 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc @@ -25,18 +25,18 @@ namespace blender::nodes { static void geo_node_attribute_compare_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("A"); - b.add_input<decl::Float>("A", "A_001"); - b.add_input<decl::Vector>("A", "A_002"); - b.add_input<decl::Color>("A", "A_003").default_value({0.5, 0.5, 0.5, 1.0}); - b.add_input<decl::String>("B"); - b.add_input<decl::Float>("B", "B_001"); - b.add_input<decl::Vector>("B", "B_002"); - b.add_input<decl::Color>("B", "B_003").default_value({0.5, 0.5, 0.5, 1.0}); - b.add_input<decl::Float>("Threshold").default_value(0.01f).min(0.0f); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("A")); + b.add_input<decl::Float>(N_("A"), "A_001"); + b.add_input<decl::Vector>(N_("A"), "A_002"); + b.add_input<decl::Color>(N_("A"), "A_003").default_value({0.5, 0.5, 0.5, 1.0}); + b.add_input<decl::String>(N_("B")); + b.add_input<decl::Float>(N_("B"), "B_001"); + b.add_input<decl::Vector>(N_("B"), "B_002"); + b.add_input<decl::Color>(N_("B"), "B_003").default_value({0.5, 0.5, 0.5, 1.0}); + b.add_input<decl::Float>(N_("Threshold")).default_value(0.01f).min(0.0f); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_compare_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_convert.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_convert.cc index a2382aa9d25..dc05fa2c125 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_convert.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_convert.cc @@ -23,10 +23,10 @@ namespace blender::nodes { static void geo_node_attribute_convert_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_convert_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc index b9621b4ae92..669ac21436f 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void geo_node_attribute_curve_map_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_curve_map_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc index 1458b6df9ba..5cb49dd83d0 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc @@ -23,14 +23,14 @@ namespace blender::nodes { static void geo_node_attribute_fill_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute").is_attribute_name(); - b.add_input<decl::Vector>("Value", "Value"); - b.add_input<decl::Float>("Value", "Value_001"); - b.add_input<decl::Color>("Value", "Value_002"); - b.add_input<decl::Bool>("Value", "Value_003"); - b.add_input<decl::Int>("Value", "Value_004"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")).is_attribute_name(); + b.add_input<decl::Vector>(N_("Value"), "Value"); + b.add_input<decl::Float>(N_("Value"), "Value_001"); + b.add_input<decl::Color>(N_("Value"), "Value_002"); + b.add_input<decl::Bool>(N_("Value"), "Value_003"); + b.add_input<decl::Int>(N_("Value"), "Value_004"); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_fill_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc index 0ea3bbe1e45..978c75187fe 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc @@ -26,21 +26,21 @@ namespace blender::nodes { static void geo_node_attribute_map_range_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute"); - b.add_input<decl::String>("Result"); - b.add_input<decl::Float>("From Min"); - b.add_input<decl::Float>("From Max").default_value(1.0f); - b.add_input<decl::Float>("To Min"); - b.add_input<decl::Float>("To Max").default_value(1.0f); - b.add_input<decl::Float>("Steps").default_value(4.0f); - b.add_input<decl::Vector>("From Min", "From Min_001"); - b.add_input<decl::Vector>("From Max", "From Max_001").default_value({1.0f, 1.0f, 1.0f}); - b.add_input<decl::Vector>("To Min", "To Min_001"); - b.add_input<decl::Vector>("To Max", "To Max_001").default_value({1.0f, 1.0f, 1.0f}); - b.add_input<decl::Vector>("Steps", "Steps_001").default_value({4.0f, 4.0f, 4.0f}); - b.add_input<decl::Bool>("Clamp"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")); + b.add_input<decl::String>(N_("Result")); + b.add_input<decl::Float>(N_("From Min")); + b.add_input<decl::Float>(N_("From Max")).default_value(1.0f); + b.add_input<decl::Float>(N_("To Min")); + b.add_input<decl::Float>(N_("To Max")).default_value(1.0f); + b.add_input<decl::Float>(N_("Steps")).default_value(4.0f); + b.add_input<decl::Vector>(N_("From Min"), "From Min_001"); + b.add_input<decl::Vector>(N_("From Max"), "From Max_001").default_value({1.0f, 1.0f, 1.0f}); + b.add_input<decl::Vector>(N_("To Min"), "To Min_001"); + b.add_input<decl::Vector>(N_("To Max"), "To Max_001").default_value({1.0f, 1.0f, 1.0f}); + b.add_input<decl::Vector>(N_("Steps"), "Steps_001").default_value({4.0f, 4.0f, 4.0f}); + b.add_input<decl::Bool>(N_("Clamp")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void fn_attribute_map_range_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc index efa09215b45..55d35f87cda 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc @@ -29,15 +29,15 @@ namespace blender::nodes { static void geo_node_attribute_math_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("A"); - b.add_input<decl::Float>("A", "A_001"); - b.add_input<decl::String>("B"); - b.add_input<decl::Float>("B", "B_001"); - b.add_input<decl::String>("C"); - b.add_input<decl::Float>("C", "C_001"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("A")); + b.add_input<decl::Float>(N_("A"), "A_001"); + b.add_input<decl::String>(N_("B")); + b.add_input<decl::Float>(N_("B"), "B_001"); + b.add_input<decl::String>(N_("C")); + b.add_input<decl::Float>(N_("C"), "C_001"); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static bool operation_use_input_c(const NodeMathOperation operation) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc index 74e05cb997d..b4205bc91b7 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc @@ -29,23 +29,23 @@ namespace blender::nodes { static void geo_node_mix_attribute_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Factor"); - b.add_input<decl::Float>("Factor", "Factor_001") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Factor")); + b.add_input<decl::Float>(N_("Factor"), "Factor_001") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input<decl::String>("A"); - b.add_input<decl::Float>("A", "A_001"); - b.add_input<decl::Vector>("A", "A_002"); - b.add_input<decl::Color>("A", "A_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_input<decl::String>("B"); - b.add_input<decl::Float>("B", "B_001"); - b.add_input<decl::Vector>("B", "B_002"); - b.add_input<decl::Color>("B", "B_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::String>(N_("A")); + b.add_input<decl::Float>(N_("A"), "A_001"); + b.add_input<decl::Vector>(N_("A"), "A_002"); + b.add_input<decl::Color>(N_("A"), "A_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_input<decl::String>(N_("B")); + b.add_input<decl::Float>(N_("B"), "B_001"); + b.add_input<decl::Vector>(N_("B"), "B_002"); + b.add_input<decl::Color>(N_("B"), "B_003").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_mix_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_proximity.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_proximity.cc index 6120118f611..9e3a7984c53 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_proximity.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_proximity.cc @@ -30,11 +30,11 @@ namespace blender::nodes { static void geo_node_attribute_proximity_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Geometry>("Target"); - b.add_input<decl::String>("Distance"); - b.add_input<decl::String>("Position"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Geometry>(N_("Target")); + b.add_input<decl::String>(N_("Distance")); + b.add_input<decl::String>(N_("Position")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_proximity_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc index 2e6ba456725..2901472d661 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc @@ -27,16 +27,16 @@ namespace blender::nodes { static void geo_node_legacy_attribute_randomize_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute"); - b.add_input<decl::Vector>("Min"); - b.add_input<decl::Vector>("Max").default_value({1.0f, 1.0f, 1.0f}); - b.add_input<decl::Float>("Min", "Min_001"); - b.add_input<decl::Float>("Max", "Max_001").default_value(1.0f); - b.add_input<decl::Int>("Min", "Min_002").min(-100000).max(100000); - b.add_input<decl::Int>("Max", "Max_002").default_value(100).min(-100000).max(100000); - b.add_input<decl::Int>("Seed").min(-10000).max(10000); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")); + b.add_input<decl::Vector>(N_("Min")); + b.add_input<decl::Vector>(N_("Max")).default_value({1.0f, 1.0f, 1.0f}); + b.add_input<decl::Float>(N_("Min"), "Min_001"); + b.add_input<decl::Float>(N_("Max"), "Max_001").default_value(1.0f); + b.add_input<decl::Int>(N_("Min"), "Min_002").min(-100000).max(100000); + b.add_input<decl::Int>(N_("Max"), "Max_002").default_value(100).min(-100000).max(100000); + b.add_input<decl::Int>(N_("Seed")).min(-10000).max(10000); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_legacy_attribute_random_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc index 52f97475941..19d6ced6eb6 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc @@ -32,11 +32,11 @@ namespace blender::nodes { static void geo_node_attribute_sample_texture_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Texture>("Texture").hide_label(); - b.add_input<decl::String>("Mapping"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Texture>(N_("Texture")).hide_label(); + b.add_input<decl::String>(N_("Mapping")); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static AttributeDomain get_result_domain(const GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc index de0090406c6..809e75e73a3 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc @@ -23,13 +23,13 @@ namespace blender::nodes { static void geo_node_attribute_separate_xyz_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Vector"); - b.add_input<decl::Vector>("Vector", "Vector_001"); - b.add_input<decl::String>("Result X"); - b.add_input<decl::String>("Result Y"); - b.add_input<decl::String>("Result Z"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Vector")); + b.add_input<decl::Vector>(N_("Vector"), "Vector_001"); + b.add_input<decl::String>(N_("Result X")); + b.add_input<decl::String>(N_("Result Y")); + b.add_input<decl::String>(N_("Result Z")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_separate_xyz_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc index d7a66dac3ad..3a9cd52661a 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc @@ -33,11 +33,11 @@ namespace blender::nodes { static void geo_node_attribute_transfer_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Geometry>("Source Geometry"); - b.add_input<decl::String>("Source"); - b.add_input<decl::String>("Destination"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Geometry>(N_("Source Geometry")); + b.add_input<decl::String>(N_("Source")); + b.add_input<decl::String>(N_("Destination")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_transfer_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc index 59903050f88..4c351846243 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc @@ -30,17 +30,17 @@ namespace blender::nodes { static void geo_node_attribute_vector_math_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("A"); - b.add_input<decl::Vector>("A", "A_001"); - b.add_input<decl::String>("B"); - b.add_input<decl::Vector>("B", "B_001"); - b.add_input<decl::Float>("B", "B_002"); - b.add_input<decl::String>("C"); - b.add_input<decl::Vector>("C", "C_001"); - b.add_input<decl::Float>("C", "C_002"); - b.add_input<decl::String>("Result"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("A")); + b.add_input<decl::Vector>(N_("A"), "A_001"); + b.add_input<decl::String>(N_("B")); + b.add_input<decl::Vector>(N_("B"), "B_001"); + b.add_input<decl::Float>(N_("B"), "B_002"); + b.add_input<decl::String>(N_("C")); + b.add_input<decl::Vector>(N_("C"), "C_001"); + b.add_input<decl::Float>(N_("C"), "C_002"); + b.add_input<decl::String>(N_("Result")); + b.add_output<decl::Geometry>(N_("Geometry")); } static bool operation_use_input_b(const NodeVectorMathOperation operation) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc index 0c515fa63fb..9ab8ec25fb6 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc @@ -25,21 +25,21 @@ namespace blender::nodes { static void geo_node_attribute_vector_rotate_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Vector"); - b.add_input<decl::Vector>("Vector", "Vector_001").min(0.0f).max(1.0f).hide_value(); - b.add_input<decl::String>("Center"); - b.add_input<decl::Vector>("Center", "Center_001").subtype(PROP_XYZ); - b.add_input<decl::String>("Axis"); - b.add_input<decl::Vector>("Axis", "Axis_001").min(-1.0f).max(1.0f).subtype(PROP_XYZ); - b.add_input<decl::String>("Angle"); - b.add_input<decl::Float>("Angle", "Angle_001").subtype(PROP_ANGLE); - b.add_input<decl::String>("Rotation"); - b.add_input<decl::Vector>("Rotation", "Rotation_001").subtype(PROP_EULER); - b.add_input<decl::Bool>("Invert"); - b.add_input<decl::String>("Result"); - - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Vector")); + b.add_input<decl::Vector>(N_("Vector"), "Vector_001").min(0.0f).max(1.0f).hide_value(); + b.add_input<decl::String>(N_("Center")); + b.add_input<decl::Vector>(N_("Center"), "Center_001").subtype(PROP_XYZ); + b.add_input<decl::String>(N_("Axis")); + b.add_input<decl::Vector>(N_("Axis"), "Axis_001").min(-1.0f).max(1.0f).subtype(PROP_XYZ); + b.add_input<decl::String>(N_("Angle")); + b.add_input<decl::Float>(N_("Angle"), "Angle_001").subtype(PROP_ANGLE); + b.add_input<decl::String>(N_("Rotation")); + b.add_input<decl::Vector>(N_("Rotation"), "Rotation_001").subtype(PROP_EULER); + b.add_input<decl::Bool>(N_("Invert")); + b.add_input<decl::String>(N_("Result")); + + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_attribute_vector_rotate_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc index 85d1392aa35..8b81008ff34 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void geo_node_curve_endpoints_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_output<decl::Geometry>("Start Points"); - b.add_output<decl::Geometry>("End Points"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_output<decl::Geometry>(N_("Start Points")); + b.add_output<decl::Geometry>(N_("End Points")); } /** diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_reverse.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_reverse.cc index d1c81333c30..ba76fafe3e6 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_reverse.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_reverse.cc @@ -24,9 +24,9 @@ namespace blender::nodes { static void geo_node_curve_reverse_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve"); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_reverse_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc index 0d3de7ac5f5..40d827ae141 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void geo_node_select_by_handle_type_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_curve_select_by_handle_type_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_set_handles.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_set_handles.cc index 339029336d9..4bac9cb976e 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_set_handles.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_set_handles.cc @@ -25,9 +25,9 @@ namespace blender::nodes { static void geo_node_curve_set_handles_decalre(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve"); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_set_handles_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_spline_type.cc index 44522e990d9..df53c96e6ca 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_spline_type.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_spline_type.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void geo_node_legacy_curve_spline_type_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve"); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_legacy_curve_spline_type_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_subdivide.cc index 61165902028..f9b0a9d128e 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_subdivide.cc @@ -33,10 +33,10 @@ namespace blender::nodes { static void geo_node_curve_subdivide_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Cuts"); - b.add_input<decl::Int>("Cuts", "Cuts_001").default_value(1).min(0).max(1000); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Cuts")); + b.add_input<decl::Int>(N_("Cuts"), "Cuts_001").default_value(1).min(0).max(1000); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_curve_subdivide_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_to_points.cc index 2936c150376..c171d485a6a 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_to_points.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_to_points.cc @@ -30,10 +30,10 @@ namespace blender::nodes { static void geo_node_curve_to_points_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Int>("Count").default_value(10).min(2).max(100000); - b.add_input<decl::Float>("Length").default_value(0.1f).min(0.001f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Int>(N_("Count")).default_value(10).min(2).max(100000); + b.add_input<decl::Float>(N_("Length")).default_value(0.1f).min(0.001f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_curve_to_points_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc index 2d9b4da4c83..1d76a0532a1 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc @@ -47,10 +47,10 @@ namespace blender::nodes { static void geo_node_delete_geometry_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Selection"); - b.add_input<decl::Bool>("Invert"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Selection")); + b.add_input<decl::Bool>(N_("Invert")); + b.add_output<decl::Geometry>(N_("Geometry")); } template<typename T> static void copy_data(Span<T> data, MutableSpan<T> r_data, IndexMask mask) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_edge_split.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_edge_split.cc index d7e908edf61..8f2bf05d2b4 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_edge_split.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_edge_split.cc @@ -26,15 +26,15 @@ namespace blender::nodes { static void geo_node_edge_split_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Bool>("Edge Angle").default_value(true); - b.add_input<decl::Float>("Angle") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Bool>(N_("Edge Angle")).default_value(true); + b.add_input<decl::Float>(N_("Angle")) .default_value(DEG2RADF(30.0f)) .min(0.0f) .max(DEG2RADF(180.0f)) .subtype(PROP_ANGLE); - b.add_input<decl::Bool>("Sharp Edges"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Bool>(N_("Sharp Edges")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_edge_split_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_material_assign.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_material_assign.cc index 7d3481c1067..333a17aa4e9 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_material_assign.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_material_assign.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void geo_node_legacy_material_assign_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Material>("Material").hide_label(true); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Material>(N_("Material")).hide_label(true); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void assign_material_to_faces(Mesh &mesh, const VArray<bool> &face_mask, Material *material) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_mesh_to_curve.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_mesh_to_curve.cc index 7a27e856cef..9167096fd3d 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_mesh_to_curve.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_mesh_to_curve.cc @@ -22,9 +22,9 @@ namespace blender::nodes { static void geo_node_legacy_mesh_to_curve_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh"); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Mesh")); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_legacy_mesh_to_curve_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_distribute.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_distribute.cc index f30feb48734..210757f986d 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_distribute.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_distribute.cc @@ -42,16 +42,16 @@ namespace blender::nodes { static void geo_node_point_distribute_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Float>("Distance Min").min(0.0f).max(100000.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Density Max") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Float>(N_("Distance Min")).min(0.0f).max(100000.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Density Max")) .default_value(1.0f) .min(0.0f) .max(100000.0f) .subtype(PROP_NONE); - b.add_input<decl::String>("Density Attribute"); - b.add_input<decl::Int>("Seed").min(-10000).max(10000); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::String>(N_("Density Attribute")); + b.add_input<decl::Int>(N_("Seed")).min(-10000).max(10000); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_point_distribute_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_instance.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_instance.cc index b68dfe44984..ffb2a0dd7ac 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_instance.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_instance.cc @@ -28,12 +28,12 @@ namespace blender::nodes { static void geo_node_point_instance_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Object>("Object").hide_label(); - b.add_input<decl::Collection>("Collection").hide_label(); - b.add_input<decl::Geometry>("Instance Geometry"); - b.add_input<decl::Int>("Seed").min(-10000).max(10000); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Object>(N_("Object")).hide_label(); + b.add_input<decl::Collection>(N_("Collection")).hide_label(); + b.add_input<decl::Geometry>(N_("Instance Geometry")); + b.add_input<decl::Int>(N_("Seed")).min(-10000).max(10000); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_point_instance_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_rotate.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_rotate.cc index 60c82360007..54d36dab98d 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_rotate.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_rotate.cc @@ -25,14 +25,16 @@ namespace blender::nodes { static void geo_node_point_rotate_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Axis"); - b.add_input<decl::Vector>("Axis", "Axis_001").default_value({0.0, 0.0, 1.0}).subtype(PROP_XYZ); - b.add_input<decl::String>("Angle"); - b.add_input<decl::Float>("Angle", "Angle_001").subtype(PROP_ANGLE); - b.add_input<decl::String>("Rotation"); - b.add_input<decl::Vector>("Rotation", "Rotation_001").subtype(PROP_EULER); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Axis")); + b.add_input<decl::Vector>(N_("Axis"), "Axis_001") + .default_value({0.0, 0.0, 1.0}) + .subtype(PROP_XYZ); + b.add_input<decl::String>(N_("Angle")); + b.add_input<decl::Float>(N_("Angle"), "Angle_001").subtype(PROP_ANGLE); + b.add_input<decl::String>(N_("Rotation")); + b.add_input<decl::Vector>(N_("Rotation"), "Rotation_001").subtype(PROP_EULER); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_point_rotate_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_scale.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_scale.cc index 99adce149e9..934442ee8a3 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_scale.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_scale.cc @@ -25,13 +25,13 @@ namespace blender::nodes { static void geo_node_point_scale_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Factor"); - b.add_input<decl::Vector>("Factor", "Factor_001") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Factor")); + b.add_input<decl::Vector>(N_("Factor"), "Factor_001") .default_value({1.0f, 1.0f, 1.0f}) .subtype(PROP_XYZ); - b.add_input<decl::Float>("Factor", "Factor_002").default_value(1.0f).min(0.0f); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Float>(N_("Factor"), "Factor_002").default_value(1.0f).min(0.0f); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_point_scale_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_separate.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_separate.cc index 48b6676c1dd..accdaf78439 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_separate.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_separate.cc @@ -27,10 +27,10 @@ namespace blender::nodes { static void geo_node_point_instance_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Mask"); - b.add_output<decl::Geometry>("Geometry 1"); - b.add_output<decl::Geometry>("Geometry 2"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Mask")); + b.add_output<decl::Geometry>(N_("Geometry 1")); + b.add_output<decl::Geometry>(N_("Geometry 2")); } template<typename T> diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_translate.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_translate.cc index f2fce45c57b..34f7641995f 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_point_translate.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_point_translate.cc @@ -23,10 +23,10 @@ namespace blender::nodes { static void geo_node_point_translate_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Translation"); - b.add_input<decl::Vector>("Translation", "Translation_001").subtype(PROP_TRANSLATION); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Translation")); + b.add_input<decl::Vector>(N_("Translation"), "Translation_001").subtype(PROP_TRANSLATION); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_point_translate_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_points_to_volume.cc index 68d3f232ce1..cf7f466c2a6 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_points_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_points_to_volume.cc @@ -32,13 +32,13 @@ namespace blender::nodes { static void geo_node_points_to_volume_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Float>("Density").default_value(1.0f).min(0.0f); - b.add_input<decl::Float>("Voxel Size").default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Voxel Amount").default_value(64.0f).min(0.0f); - b.add_input<decl::String>("Radius"); - b.add_input<decl::Float>("Radius", "Radius_001").default_value(0.5f).min(0.0f); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Float>(N_("Density")).default_value(1.0f).min(0.0f); + b.add_input<decl::Float>(N_("Voxel Size")).default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Voxel Amount")).default_value(64.0f).min(0.0f); + b.add_input<decl::String>(N_("Radius")); + b.add_input<decl::Float>(N_("Radius"), "Radius_001").default_value(0.5f).min(0.0f); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_points_to_volume_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_raycast.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_raycast.cc index 6641e622362..e6a81fc9627 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_raycast.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_raycast.cc @@ -28,23 +28,23 @@ namespace blender::nodes { static void geo_node_raycast_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Geometry>("Target Geometry"); - b.add_input<decl::String>("Ray Direction"); - b.add_input<decl::Vector>("Ray Direction", "Ray Direction_001") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Geometry>(N_("Target Geometry")); + b.add_input<decl::String>(N_("Ray Direction")); + b.add_input<decl::Vector>(N_("Ray Direction"), "Ray Direction_001") .default_value({0.0f, 0.0f, 1.0f}); - b.add_input<decl::String>("Ray Length"); - b.add_input<decl::Float>("Ray Length", "Ray Length_001") + b.add_input<decl::String>(N_("Ray Length")); + b.add_input<decl::Float>(N_("Ray Length"), "Ray Length_001") .default_value(100.0f) .min(0.0f) .subtype(PROP_DISTANCE); - b.add_input<decl::String>("Target Attribute"); - b.add_input<decl::String>("Is Hit"); - b.add_input<decl::String>("Hit Position"); - b.add_input<decl::String>("Hit Normal"); - b.add_input<decl::String>("Hit Distance"); - b.add_input<decl::String>("Hit Attribute"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::String>(N_("Target Attribute")); + b.add_input<decl::String>(N_("Is Hit")); + b.add_input<decl::String>(N_("Hit Position")); + b.add_input<decl::String>(N_("Hit Normal")); + b.add_input<decl::String>(N_("Hit Distance")); + b.add_input<decl::String>(N_("Hit Attribute")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_raycast_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_select_by_material.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_select_by_material.cc index eabdd2bcd5a..a8d6f33a5fd 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_select_by_material.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_select_by_material.cc @@ -30,10 +30,10 @@ namespace blender::nodes { static void geo_node_legacy_select_by_material_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Material>("Material").hide_label(); - b.add_input<decl::String>("Selection"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Material>(N_("Material")).hide_label(); + b.add_input<decl::String>(N_("Selection")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void select_mesh_by_material(const Mesh &mesh, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc index 101c915eb77..295cd05fd01 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc @@ -27,10 +27,10 @@ namespace blender::nodes { static void geo_node_subdivision_surface_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Int>("Level").default_value(1).min(0).max(6); - b.add_input<decl::Bool>("Use Creases"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Int>(N_("Level")).default_value(1).min(0).max(6); + b.add_input<decl::Bool>(N_("Use Creases")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_subdivision_surface_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_volume_to_mesh.cc index 45f55dcf92e..39af5bf1fd2 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_volume_to_mesh.cc @@ -39,13 +39,13 @@ namespace blender::nodes { static void geo_node_volume_to_mesh_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Density"); - b.add_input<decl::Float>("Voxel Size").default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Voxel Amount").default_value(64.0f).min(0.0f); - b.add_input<decl::Float>("Threshold").default_value(0.1f).min(0.0f); - b.add_input<decl::Float>("Adaptivity").min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Density")); + b.add_input<decl::Float>(N_("Voxel Size")).default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Voxel Amount")).default_value(64.0f).min(0.0f); + b.add_input<decl::Float>(N_("Threshold")).default_value(0.1f).min(0.0f); + b.add_input<decl::Float>(N_("Adaptivity")).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_volume_to_mesh_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc index 8ad70cd6d3f..5cc8f1476f8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc @@ -25,19 +25,19 @@ namespace blender::nodes { static void geo_node_attribute_capture_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Vector>("Value").supports_field(); - b.add_input<decl::Float>("Value", "Value_001").supports_field(); - b.add_input<decl::Color>("Value", "Value_002").supports_field(); - b.add_input<decl::Bool>("Value", "Value_003").supports_field(); - b.add_input<decl::Int>("Value", "Value_004").supports_field(); - - b.add_output<decl::Geometry>("Geometry"); - b.add_output<decl::Vector>("Attribute").field_source(); - b.add_output<decl::Float>("Attribute", "Attribute_001").field_source(); - b.add_output<decl::Color>("Attribute", "Attribute_002").field_source(); - b.add_output<decl::Bool>("Attribute", "Attribute_003").field_source(); - b.add_output<decl::Int>("Attribute", "Attribute_004").field_source(); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Vector>(N_("Value")).supports_field(); + b.add_input<decl::Float>(N_("Value"), "Value_001").supports_field(); + b.add_input<decl::Color>(N_("Value"), "Value_002").supports_field(); + b.add_input<decl::Bool>(N_("Value"), "Value_003").supports_field(); + b.add_input<decl::Int>(N_("Value"), "Value_004").supports_field(); + + b.add_output<decl::Geometry>(N_("Geometry")); + b.add_output<decl::Vector>(N_("Attribute")).field_source(); + b.add_output<decl::Float>(N_("Attribute"), "Attribute_001").field_source(); + b.add_output<decl::Color>(N_("Attribute"), "Attribute_002").field_source(); + b.add_output<decl::Bool>(N_("Attribute"), "Attribute_003").field_source(); + b.add_output<decl::Int>(N_("Attribute"), "Attribute_004").field_source(); } static void geo_node_attribute_capture_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_remove.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_remove.cc index 65a137a028d..f80b8ccc971 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_remove.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_remove.cc @@ -20,9 +20,9 @@ namespace blender::nodes { static void geo_node_attribute_remove_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::String>("Attribute").multi_input(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::String>(N_("Attribute")).multi_input(); + b.add_output<decl::Geometry>(N_("Geometry")); } static void remove_attribute(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc index 1b7d2fe28a1..155bd8c8c28 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc @@ -28,27 +28,27 @@ namespace blender::nodes { static void geo_node_attribute_statistic_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Float>("Attribute").hide_value().supports_field(); - b.add_input<decl::Vector>("Attribute", "Attribute_001").hide_value().supports_field(); - - b.add_output<decl::Float>("Mean"); - b.add_output<decl::Float>("Median"); - b.add_output<decl::Float>("Sum"); - b.add_output<decl::Float>("Min"); - b.add_output<decl::Float>("Max"); - b.add_output<decl::Float>("Range"); - b.add_output<decl::Float>("Standard Deviation"); - b.add_output<decl::Float>("Variance"); - - b.add_output<decl::Vector>("Mean", "Mean_001"); - b.add_output<decl::Vector>("Median", "Median_001"); - b.add_output<decl::Vector>("Sum", "Sum_001"); - b.add_output<decl::Vector>("Min", "Min_001"); - b.add_output<decl::Vector>("Max", "Max_001"); - b.add_output<decl::Vector>("Range", "Range_001"); - b.add_output<decl::Vector>("Standard Deviation", "Standard Deviation_001"); - b.add_output<decl::Vector>("Variance", "Variance_001"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Float>(N_("Attribute")).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Attribute"), "Attribute_001").hide_value().supports_field(); + + b.add_output<decl::Float>(N_("Mean")); + b.add_output<decl::Float>(N_("Median")); + b.add_output<decl::Float>(N_("Sum")); + b.add_output<decl::Float>(N_("Min")); + b.add_output<decl::Float>(N_("Max")); + b.add_output<decl::Float>(N_("Range")); + b.add_output<decl::Float>(N_("Standard Deviation")); + b.add_output<decl::Float>(N_("Variance")); + + b.add_output<decl::Vector>(N_("Mean"), "Mean_001"); + b.add_output<decl::Vector>(N_("Median"), "Median_001"); + b.add_output<decl::Vector>(N_("Sum"), "Sum_001"); + b.add_output<decl::Vector>(N_("Min"), "Min_001"); + b.add_output<decl::Vector>(N_("Max"), "Max_001"); + b.add_output<decl::Vector>(N_("Range"), "Range_001"); + b.add_output<decl::Vector>(N_("Standard Deviation"), "Standard Deviation_001"); + b.add_output<decl::Vector>(N_("Variance"), "Variance_001"); } static void geo_node_attribute_statistic_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc index 63b88c57694..516f07b7ad3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc @@ -27,13 +27,13 @@ namespace blender::nodes { static void geo_node_boolean_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh 1") + b.add_input<decl::Geometry>(N_("Mesh 1")) .only_realized_data() .supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Geometry>("Mesh 2").multi_input().supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Self Intersection"); - b.add_input<decl::Bool>("Hole Tolerant"); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Mesh 2")).multi_input().supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Self Intersection")); + b.add_input<decl::Bool>(N_("Hole Tolerant")); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_boolean_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc b/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc index e34b65e6c94..e7c9715934a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc @@ -20,10 +20,10 @@ namespace blender::nodes { static void geo_node_bounding_box_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_output<decl::Geometry>("Bounding Box"); - b.add_output<decl::Vector>("Min"); - b.add_output<decl::Vector>("Max"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_output<decl::Geometry>(N_("Bounding Box")); + b.add_output<decl::Vector>(N_("Min")); + b.add_output<decl::Vector>(N_("Max")); } static void geo_node_bounding_box_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc index 18fc09daf01..f068e621596 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc @@ -31,15 +31,15 @@ namespace blender::nodes { static void geo_node_collection_info_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Collection>("Collection").hide_label(); - b.add_input<decl::Bool>("Separate Children") + b.add_input<decl::Collection>(N_("Collection")).hide_label(); + b.add_input<decl::Bool>(N_("Separate Children")) .description( - "Output each child of the collection as a separate instance, sorted alphabetically"); - b.add_input<decl::Bool>("Reset Children") + N_("Output each child of the collection as a separate instance, sorted alphabetically")); + b.add_input<decl::Bool>(N_("Reset Children")) .description( - "Reset the transforms of every child instance in the output. Only used when Separate " - "Children is enabled"); - b.add_output<decl::Geometry>("Geometry"); + N_("Reset the transforms of every child instance in the output. Only used when Separate " + "Children is enabled")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_collection_info_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc index 4377d32210d..3cf682e161c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc @@ -32,8 +32,8 @@ namespace blender::nodes { static void geo_node_convex_hull_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_output<decl::Geometry>("Convex Hull"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_output<decl::Geometry>(N_("Convex Hull")); } using bke::GeometryInstanceGroup; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc index fbe5af3bb18..42d88cdb1e7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc @@ -25,19 +25,20 @@ namespace blender::nodes { static void geo_node_curve_endpoint_selection_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Start Size") + b.add_input<decl::Int>(N_("Start Size")) .min(0) .default_value(1) .supports_field() - .description("The amount of points to select from the start of each spline"); - b.add_input<decl::Int>("End Size") + .description(N_("The amount of points to select from the start of each spline")); + b.add_input<decl::Int>(N_("End Size")) .min(0) .default_value(1) .supports_field() - .description("The amount of points to select from the end of each spline"); - b.add_output<decl::Bool>("Selection") + .description(N_("The amount of points to select from the end of each spline")); + b.add_output<decl::Bool>(N_("Selection")) .field_source() - .description("The selection from the start and end of the splines based on the input sizes"); + .description( + N_("The selection from the start and end of the splines based on the input sizes")); } static void select_by_spline(const int start, const int end, MutableSpan<bool> r_selection) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index 75459a97816..219effadec4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -35,8 +35,8 @@ namespace blender::nodes { static void geo_node_curve_fill_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_curve_fill_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc index 5b6dfb01f38..27d7d22b106 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -29,16 +29,16 @@ namespace blender::nodes { static void geo_node_curve_fillet_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Int>("Count").default_value(1).min(1).max(1000).supports_field(); - b.add_input<decl::Float>("Radius") + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Int>(N_("Count")).default_value(1).min(1).max(1000).supports_field(); + b.add_input<decl::Float>(N_("Radius")) .min(0.0f) .max(FLT_MAX) .subtype(PropertySubType::PROP_DISTANCE) .default_value(0.25f) .supports_field(); - b.add_input<decl::Bool>("Limit Radius"); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Bool>(N_("Limit Radius")); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_fillet_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc index 3ae330fd5cd..165f5da5f71 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc @@ -25,7 +25,7 @@ namespace blender::nodes { static void geo_node_curve_handle_type_selection_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Bool>("Selection").field_source(); + b.add_output<decl::Bool>(N_("Selection")).field_source(); } static void geo_node_curve_handle_type_selection_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_length.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_length.cc index ef617ed3742..0d0dc0ec89c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_length.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_length.cc @@ -21,8 +21,8 @@ namespace blender::nodes { static void geo_node_curve_length_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_output<decl::Float>("Length"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_output<decl::Float>(N_("Length")); } static void geo_node_curve_length_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc index 938f5f22a03..4c89aba2e6d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc @@ -24,7 +24,7 @@ namespace blender::nodes { static void geo_node_curve_parameter_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Factor").field_source(); + b.add_output<decl::Float>(N_("Factor")).field_source(); } /** diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc index 313473e3442..a755d47cc6a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc @@ -25,14 +25,20 @@ namespace blender::nodes { static void geo_node_curve_primitive_bezier_segment_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Resolution").default_value(16).min(1).max(256).subtype(PROP_UNSIGNED); - b.add_input<decl::Vector>("Start").default_value({-1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Start Handle") + b.add_input<decl::Int>(N_("Resolution")) + .default_value(16) + .min(1) + .max(256) + .subtype(PROP_UNSIGNED); + b.add_input<decl::Vector>(N_("Start")) + .default_value({-1.0f, 0.0f, 0.0f}) + .subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Start Handle")) .default_value({-0.5f, 0.5f, 0.0f}) .subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("End Handle").subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("End").default_value({1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Vector>(N_("End Handle")).subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("End")).default_value({1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_primitive_bezier_segment_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc index 8d5f4855512..bf4f22d6578 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc @@ -25,15 +25,19 @@ namespace blender::nodes { static void geo_node_curve_primitive_circle_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Resolution").default_value(32).min(3).max(512); - b.add_input<decl::Vector>("Point 1") + b.add_input<decl::Int>(N_("Resolution")).default_value(32).min(3).max(512); + b.add_input<decl::Vector>(N_("Point 1")) .default_value({-1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Point 2").default_value({0.0f, 1.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Point 3").default_value({1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_input<decl::Float>("Radius").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Curve"); - b.add_output<decl::Vector>("Center"); + b.add_input<decl::Vector>(N_("Point 2")) + .default_value({0.0f, 1.0f, 0.0f}) + .subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Point 3")) + .default_value({1.0f, 0.0f, 0.0f}) + .subtype(PROP_TRANSLATION); + b.add_input<decl::Float>(N_("Radius")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Curve")); + b.add_output<decl::Vector>(N_("Center")); } static void geo_node_curve_primitive_circle_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc index a3d2ada612f..5b215797052 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc @@ -25,11 +25,11 @@ namespace blender::nodes { static void geo_node_curve_primitive_line_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Vector>("Start").subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("End").default_value({0.0f, 0.0f, 1.0f}).subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Direction").default_value({0.0f, 0.0f, 1.0f}); - b.add_input<decl::Float>("Length").default_value(1.0f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Vector>(N_("Start")).subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("End")).default_value({0.0f, 0.0f, 1.0f}).subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Direction")).default_value({0.0f, 0.0f, 1.0f}); + b.add_input<decl::Float>(N_("Length")).default_value(1.0f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_primitive_line_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc index a54fd971ac4..6041ddee02d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc @@ -21,11 +21,19 @@ namespace blender::nodes { static void geo_node_curve_primitive_quadratic_bezier_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Resolution").default_value(16).min(3).max(256).subtype(PROP_UNSIGNED); - b.add_input<decl::Vector>("Start").default_value({-1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Middle").default_value({0.0f, 2.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("End").default_value({1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Int>(N_("Resolution")) + .default_value(16) + .min(3) + .max(256) + .subtype(PROP_UNSIGNED); + b.add_input<decl::Vector>(N_("Start")) + .default_value({-1.0f, 0.0f, 0.0f}) + .subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Middle")) + .default_value({0.0f, 2.0f, 0.0f}) + .subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("End")).default_value({1.0f, 0.0f, 0.0f}).subtype(PROP_TRANSLATION); + b.add_output<decl::Geometry>(N_("Curve")); } static std::unique_ptr<CurveEval> create_quadratic_bezier_curve(const float3 p1, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc index 07ddaa8f61e..7260da05a8d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc @@ -23,18 +23,32 @@ namespace blender::nodes { static void geo_node_curve_primitive_quadrilateral_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Width").default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Height").default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Bottom Width").default_value(4.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Top Width").default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Offset").default_value(1.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Bottom Height").default_value(3.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Top Height").default_value(1.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Vector>("Point 1").default_value({-1.0f, -1.0f, 0.0f}).subtype(PROP_DISTANCE); - b.add_input<decl::Vector>("Point 2").default_value({1.0f, -1.0f, 0.0f}).subtype(PROP_DISTANCE); - b.add_input<decl::Vector>("Point 3").default_value({1.0f, 1.0f, 0.0f}).subtype(PROP_DISTANCE); - b.add_input<decl::Vector>("Point 4").default_value({-1.0f, 1.0f, 0.0f}).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Float>(N_("Width")).default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Height")).default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Bottom Width")) + .default_value(4.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Top Width")).default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Offset")).default_value(1.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Bottom Height")) + .default_value(3.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Top Height")).default_value(1.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Vector>(N_("Point 1")) + .default_value({-1.0f, -1.0f, 0.0f}) + .subtype(PROP_DISTANCE); + b.add_input<decl::Vector>(N_("Point 2")) + .default_value({1.0f, -1.0f, 0.0f}) + .subtype(PROP_DISTANCE); + b.add_input<decl::Vector>(N_("Point 3")) + .default_value({1.0f, 1.0f, 0.0f}) + .subtype(PROP_DISTANCE); + b.add_input<decl::Vector>(N_("Point 4")) + .default_value({-1.0f, 1.0f, 0.0f}) + .subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_primitive_quadrilateral_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_spiral.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_spiral.cc index 7292fafc8b0..1dc9cd7f107 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_spiral.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_spiral.cc @@ -22,13 +22,17 @@ namespace blender::nodes { static void geo_node_curve_primitive_spiral_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Resolution").default_value(32).min(1).max(1024).subtype(PROP_UNSIGNED); - b.add_input<decl::Float>("Rotations").default_value(2.0f).min(0.0f); - b.add_input<decl::Float>("Start Radius").default_value(1.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("End Radius").default_value(2.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Height").default_value(2.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Bool>("Reverse"); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Int>(N_("Resolution")) + .default_value(32) + .min(1) + .max(1024) + .subtype(PROP_UNSIGNED); + b.add_input<decl::Float>(N_("Rotations")).default_value(2.0f).min(0.0f); + b.add_input<decl::Float>(N_("Start Radius")).default_value(1.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("End Radius")).default_value(2.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Height")).default_value(2.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Bool>(N_("Reverse")); + b.add_output<decl::Geometry>(N_("Curve")); } static std::unique_ptr<CurveEval> create_spiral_curve(const float rotations, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_star.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_star.cc index 6261146562d..b5bafce17c6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_star.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_star.cc @@ -22,11 +22,17 @@ namespace blender::nodes { static void geo_node_curve_primitive_star_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Points").default_value(8).min(3).max(256).subtype(PROP_UNSIGNED); - b.add_input<decl::Float>("Inner Radius").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Outer Radius").default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Twist").subtype(PROP_ANGLE); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Int>(N_("Points")).default_value(8).min(3).max(256).subtype(PROP_UNSIGNED); + b.add_input<decl::Float>(N_("Inner Radius")) + .default_value(1.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Outer Radius")) + .default_value(2.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Twist")).subtype(PROP_ANGLE); + b.add_output<decl::Geometry>(N_("Curve")); } static std::unique_ptr<CurveEval> create_star_curve(const float inner_radius, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc index c0134e802cf..945dac5650b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc @@ -34,11 +34,14 @@ namespace blender::nodes { static void geo_node_curve_resample_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Int>("Count").default_value(10).min(1).max(100000).supports_field(); - b.add_input<decl::Float>("Length").default_value(0.1f).min(0.001f).supports_field().subtype( - PROP_DISTANCE); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Int>(N_("Count")).default_value(10).min(1).max(100000).supports_field(); + b.add_input<decl::Float>(N_("Length")) + .default_value(0.1f) + .min(0.001f) + .supports_field() + .subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_resample_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc index f23d409741f..745012c1851 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc @@ -24,9 +24,9 @@ namespace blender::nodes { static void geo_node_curve_reverse_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_reverse_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc index 02d1e35cd07..31b38c0dce7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc @@ -27,14 +27,15 @@ namespace blender::nodes { static void geo_node_curve_sample_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").only_realized_data().supported_type( - GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Float>("Factor").min(0.0f).max(1.0f).subtype(PROP_FACTOR).supports_field(); - b.add_input<decl::Float>("Length").min(0.0f).subtype(PROP_DISTANCE).supports_field(); - - b.add_output<decl::Vector>("Position").dependent_field(); - b.add_output<decl::Vector>("Tangent").dependent_field(); - b.add_output<decl::Vector>("Normal").dependent_field(); + b.add_input<decl::Geometry>(N_("Curve")) + .only_realized_data() + .supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Float>(N_("Factor")).min(0.0f).max(1.0f).subtype(PROP_FACTOR).supports_field(); + b.add_input<decl::Float>(N_("Length")).min(0.0f).subtype(PROP_DISTANCE).supports_field(); + + b.add_output<decl::Vector>(N_("Position")).dependent_field(); + b.add_output<decl::Vector>(N_("Tangent")).dependent_field(); + b.add_output<decl::Vector>(N_("Normal")).dependent_field(); } static void geo_node_curve_sample_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc index 8ee2ee76780..8b0a6ca840c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc @@ -25,9 +25,9 @@ namespace blender::nodes { static void geo_node_curve_set_handles_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_set_handles_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc index ddbd2d74dd6..ae4453929ac 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void geo_node_curve_spline_type_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_spline_type_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc index a0a62270b2d..b52de822c22 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc @@ -33,9 +33,9 @@ namespace blender::nodes { static void geo_node_curve_subdivide_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Int>("Cuts").default_value(1).min(0).max(1000).supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Int>(N_("Cuts")).default_value(1).min(0).max(1000).supports_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static Array<int> get_subdivided_offsets(const Spline &spline, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc index b6aa550cf2e..1977b465de4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc @@ -27,14 +27,14 @@ namespace blender::nodes { static void geo_node_curve_to_mesh_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Geometry>("Profile Curve") + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Geometry>(N_("Profile Curve")) .only_realized_data() .supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Fill Caps") + b.add_input<decl::Bool>(N_("Fill Caps")) .description( - "If the profile spline is cyclic, fill the ends of the generated mesh with N-gons"); - b.add_output<decl::Geometry>("Mesh"); + N_("If the profile spline is cyclic, fill the ends of the generated mesh with N-gons")); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geometry_set_curve_to_mesh(GeometrySet &geometry_set, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc index 0f74a9edcf9..38d7fb99e87 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc @@ -30,13 +30,13 @@ namespace blender::nodes { static void geo_node_curve_to_points_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Int>("Count").default_value(10).min(2).max(100000); - b.add_input<decl::Float>("Length").default_value(0.1f).min(0.001f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Points"); - b.add_output<decl::Vector>("Tangent").field_source(); - b.add_output<decl::Vector>("Normal").field_source(); - b.add_output<decl::Vector>("Rotation").field_source(); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Int>(N_("Count")).default_value(10).min(2).max(100000); + b.add_input<decl::Float>(N_("Length")).default_value(0.1f).min(0.001f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Points")); + b.add_output<decl::Vector>(N_("Tangent")).field_source(); + b.add_output<decl::Vector>(N_("Normal")).field_source(); + b.add_output<decl::Vector>(N_("Rotation")).field_source(); } static void geo_node_curve_to_points_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc index 44a403b80a5..4e1a2910c7c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -28,21 +28,24 @@ namespace blender::nodes { static void geo_node_curve_trim_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Float>("Start").min(0.0f).max(1.0f).subtype(PROP_FACTOR).supports_field(); - b.add_input<decl::Float>("End") + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Float>(N_("Start")).min(0.0f).max(1.0f).subtype(PROP_FACTOR).supports_field(); + b.add_input<decl::Float>(N_("End")) .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR) .supports_field(); - b.add_input<decl::Float>("Start", "Start_001").min(0.0f).subtype(PROP_DISTANCE).supports_field(); - b.add_input<decl::Float>("End", "End_001") + b.add_input<decl::Float>(N_("Start"), "Start_001") + .min(0.0f) + .subtype(PROP_DISTANCE) + .supports_field(); + b.add_input<decl::Float>(N_("End"), "End_001") .min(0.0f) .default_value(1.0f) .subtype(PROP_DISTANCE) .supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_curve_trim_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc index e293cd9b8fe..e0a3faaefb0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -50,13 +50,13 @@ namespace blender::nodes { static void geo_node_delete_geometry_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Bool>("Selection") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Bool>(N_("Selection")) .default_value(true) .hide_value() .supports_field() - .description("The parts of the geometry to be deleted"); - b.add_output<decl::Geometry>("Geometry"); + .description(N_("The parts of the geometry to be deleted")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_delete_geometry_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index 21e6004347e..fa439b04da0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -42,22 +42,22 @@ namespace blender::nodes { static void geo_node_point_distribute_points_on_faces_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Float>("Distance Min").min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Density Max").default_value(10.0f).min(0.0f); - b.add_input<decl::Float>("Density").default_value(10.0f).supports_field(); - b.add_input<decl::Float>("Density Factor") + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Float>(N_("Distance Min")).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Density Max")).default_value(10.0f).min(0.0f); + b.add_input<decl::Float>(N_("Density")).default_value(10.0f).supports_field(); + b.add_input<decl::Float>(N_("Density Factor")) .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .supports_field(); - b.add_input<decl::Int>("Seed"); + b.add_input<decl::Int>(N_("Seed")); - b.add_output<decl::Geometry>("Points"); - b.add_output<decl::Vector>("Normal").field_source(); - b.add_output<decl::Vector>("Rotation").subtype(PROP_EULER).field_source(); + b.add_output<decl::Geometry>(N_("Points")); + b.add_output<decl::Vector>(N_("Normal")).field_source(); + b.add_output<decl::Vector>(N_("Rotation")).subtype(PROP_EULER).field_source(); } static void geo_node_point_distribute_points_on_faces_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc index 2f9d3a60ba3..f562fb29e90 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc @@ -26,9 +26,9 @@ namespace blender::nodes { static void geo_node_edge_split_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_output<decl::Geometry>(N_("Mesh")); } static Mesh *mesh_edge_split(const Mesh &mesh, const IndexMask selection) diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc index 02f99b6cf94..e1c72fbd438 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc @@ -36,12 +36,13 @@ namespace blender::nodes { static void geo_node_image_texture_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Image>("Image").hide_label(); - b.add_input<decl::Vector>("Vector").implicit_field().description( - "Texture coordinates from 0 to 1"); - b.add_input<decl::Int>("Frame").min(0).max(MAXFRAMEF); - b.add_output<decl::Color>("Color").no_muted_links().dependent_field(); - b.add_output<decl::Float>("Alpha").no_muted_links().dependent_field(); + b.add_input<decl::Image>(N_("Image")).hide_label(); + b.add_input<decl::Vector>(N_("Vector")) + .implicit_field() + .description(("Texture coordinates from 0 to 1")); + b.add_input<decl::Int>(N_("Frame")).min(0).max(MAXFRAMEF); + b.add_output<decl::Color>(N_("Color")).no_muted_links().dependent_field(); + b.add_output<decl::Float>(N_("Alpha")).no_muted_links().dependent_field(); } static void geo_node_image_texture_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc index 604b181918d..b8df545d073 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc @@ -20,8 +20,8 @@ namespace blender::nodes { static void geo_node_input_curve_handles_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Vector>("Left").field_source(); - b.add_output<decl::Vector>("Right").field_source(); + b.add_output<decl::Vector>(N_("Left")).field_source(); + b.add_output<decl::Vector>(N_("Right")).field_source(); } static void geo_node_input_curve_handles_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_curve_tilt.cc b/source/blender/nodes/geometry/nodes/node_geo_input_curve_tilt.cc index 5a24b7f3f07..f32db3842db 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_curve_tilt.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_curve_tilt.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_curve_tilt_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Tilt").field_source(); + b.add_output<decl::Float>(N_("Tilt")).field_source(); } static void geo_node_input_curve_tilt_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_id.cc b/source/blender/nodes/geometry/nodes/node_geo_input_id.cc index d267325c26b..37d5bac0325 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_id.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_id.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_id_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Int>("ID").field_source(); + b.add_output<decl::Int>(N_("ID")).field_source(); } static void geo_node_input_id_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_index.cc b/source/blender/nodes/geometry/nodes/node_geo_input_index.cc index 7fcbaf429dd..6200ac5e7a8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_index.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_index_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Int>("Index").field_source(); + b.add_output<decl::Int>(N_("Index")).field_source(); } static void geo_node_input_index_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc index 8e805bd1359..fc41188dee5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc @@ -23,7 +23,7 @@ namespace blender::nodes { static void geo_node_input_material_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Material>("Material"); + b.add_output<decl::Material>(N_("Material")); } static void geo_node_input_material_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_material_index.cc b/source/blender/nodes/geometry/nodes/node_geo_input_material_index.cc index 702c83daea0..5d5d9e40032 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_material_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_material_index.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_material_index_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Int>("Material Index").field_source(); + b.add_output<decl::Int>(N_("Material Index")).field_source(); } static void geo_node_input_material_index_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc b/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc index 3387f8d6c6e..92b89313d23 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc @@ -28,7 +28,7 @@ namespace blender::nodes { static void geo_node_input_normal_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Vector>("Normal").field_source(); + b.add_output<decl::Vector>(N_("Normal")).field_source(); } static GVArrayPtr mesh_face_normals(const Mesh &mesh, diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_position.cc b/source/blender/nodes/geometry/nodes/node_geo_input_position.cc index 44874259e20..a8477d4bc4f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_position.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_position.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_position_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Vector>("Position").field_source(); + b.add_output<decl::Vector>(N_("Position")).field_source(); } static void geo_node_input_position_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_radius.cc b/source/blender/nodes/geometry/nodes/node_geo_input_radius.cc index 586005511ad..6d2c4c38cbe 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_radius.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_radius.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_radius_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Radius").default_value(1.0f).min(0.0f).field_source(); + b.add_output<decl::Float>(N_("Radius")).default_value(1.0f).min(0.0f).field_source(); } static void geo_node_input_radius_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_shade_smooth.cc b/source/blender/nodes/geometry/nodes/node_geo_input_shade_smooth.cc index de520787e78..dcd14b1c054 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_shade_smooth.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_shade_smooth.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_shade_smooth_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Bool>("Smooth").field_source(); + b.add_output<decl::Bool>(N_("Smooth")).field_source(); } static void geo_node_input_shade_smooth_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_spline_cyclic.cc b/source/blender/nodes/geometry/nodes/node_geo_input_spline_cyclic.cc index 44a1bb62de8..a8ee6dd8b12 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_spline_cyclic.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_spline_cyclic.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_spline_cyclic_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Bool>("Cyclic").field_source(); + b.add_output<decl::Bool>(N_("Cyclic")).field_source(); } static void geo_node_input_spline_cyclic_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc b/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc index ec502f7f1bc..895efa6f0ed 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc @@ -22,7 +22,7 @@ namespace blender::nodes { static void geo_node_input_spline_length_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Length").field_source(); + b.add_output<decl::Float>(N_("Length")).field_source(); } static const GVArray *construct_spline_length_gvarray(const CurveComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_spline_resolution.cc b/source/blender/nodes/geometry/nodes/node_geo_input_spline_resolution.cc index eab95ebc46e..75fb8a13d38 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_spline_resolution.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_spline_resolution.cc @@ -20,7 +20,7 @@ namespace blender::nodes { static void geo_node_input_spline_resolution_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Int>("Resolution").field_source(); + b.add_output<decl::Int>(N_("Resolution")).field_source(); } static void geo_node_input_spline_resolution_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc index f746edbbca2..6b1736fe2ac 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc @@ -24,7 +24,7 @@ namespace blender::nodes { static void geo_node_input_tangent_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Vector>("Tangent").field_source(); + b.add_output<decl::Vector>(N_("Tangent")).field_source(); } static void calculate_bezier_tangents(const BezierSpline &spline, MutableSpan<float3> tangents) diff --git a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc index 1e94a4a6a50..aff29d973d4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc @@ -28,28 +28,29 @@ namespace blender::nodes { static void geo_node_instance_on_points_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Points").description("Points to instance on"); - b.add_input<decl::Bool>("Selection").default_value(true).supports_field().hide_value(); - b.add_input<decl::Geometry>("Instance").description("Geometry that is instanced on the points"); - b.add_input<decl::Bool>("Pick Instance") + b.add_input<decl::Geometry>(N_("Points")).description(N_("Points to instance on")); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).supports_field().hide_value(); + b.add_input<decl::Geometry>(N_("Instance")) + .description(N_("Geometry that is instanced on the points")); + b.add_input<decl::Bool>(N_("Pick Instance")) .supports_field() .description("Place different instances on different points"); - b.add_input<decl::Int>("Instance Index") + b.add_input<decl::Int>(N_("Instance Index")) .implicit_field() - .description( + .description(N_( "Index of the instance that used for each point. This is only used when Pick Instances " - "is on. By default the point index is used"); - b.add_input<decl::Vector>("Rotation") + "is on. By default the point index is used")); + b.add_input<decl::Vector>(N_("Rotation")) .subtype(PROP_EULER) .supports_field() - .description("Rotation of the instances"); - b.add_input<decl::Vector>("Scale") + .description(N_("Rotation of the instances")); + b.add_input<decl::Vector>(N_("Scale")) .default_value({1.0f, 1.0f, 1.0f}) .subtype(PROP_XYZ) .supports_field() - .description("Scale of the instances"); + .description(N_("Scale of the instances")); - b.add_output<decl::Geometry>("Instances"); + b.add_output<decl::Geometry>(N_("Instances")); } static void add_instances_from_component(InstancesComponent &dst_component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc index 618d85d9c2f..c3955426e69 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc @@ -23,15 +23,15 @@ namespace blender::nodes { static void geo_node_instances_to_points_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Instances").only_instances(); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("Position").implicit_field(); - b.add_input<decl::Float>("Radius") + b.add_input<decl::Geometry>(N_("Instances")).only_instances(); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Position")).implicit_field(); + b.add_input<decl::Float>(N_("Radius")) .default_value(0.05f) .min(0.0f) .subtype(PROP_DISTANCE) .supports_field(); - b.add_output<decl::Geometry>("Points"); + b.add_output<decl::Geometry>(N_("Points")); } template<typename T> diff --git a/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc b/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc index f8a1c764f61..8e0e98f7bd5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc @@ -22,7 +22,7 @@ namespace blender::nodes { static void geo_node_is_viewport_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Bool>("Is Viewport"); + b.add_output<decl::Bool>(N_("Is Viewport")); } static void geo_node_is_viewport_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc index bbba8635b88..cd385f364e9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -33,8 +33,8 @@ namespace blender::nodes { static void geo_node_join_geometry_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").multi_input(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).multi_input(); + b.add_output<decl::Geometry>(N_("Geometry")); } static Mesh *join_mesh_topology_and_builtin_attributes(Span<const MeshComponent *> src_components) diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc index 7181b438282..e4a62bd5267 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void geo_node_material_replace_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Material>("Old"); - b.add_input<decl::Material>("New"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Material>(N_("Old")); + b.add_input<decl::Material>(N_("New")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_material_replace_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc index 7dffc7793e5..06c770820ee 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc @@ -30,8 +30,8 @@ namespace blender::nodes { static void geo_node_material_selection_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Material>("Material").hide_label(true); - b.add_output<decl::Bool>("Selection").field_source(); + b.add_input<decl::Material>(N_("Material")).hide_label(true); + b.add_output<decl::Bool>(N_("Selection")).field_source(); } static void select_mesh_by_material(const Mesh &mesh, diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc index 2374d28523c..685a8faff5c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc @@ -29,9 +29,9 @@ namespace blender::nodes { static void geo_node_mesh_primitive_circle_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Vertices").default_value(32).min(3); - b.add_input<decl::Float>("Radius").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Int>(N_("Vertices")).default_value(32).min(3); + b.add_input<decl::Float>(N_("Radius")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_mesh_primitive_circle_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc index bac859c6461..206d48d40c8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc @@ -29,13 +29,16 @@ namespace blender::nodes { static void geo_node_mesh_primitive_cone_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Vertices").default_value(32).min(3).max(512); - b.add_input<decl::Int>("Side Segments").default_value(1).min(1).max(512); - b.add_input<decl::Int>("Fill Segments").default_value(1).min(1).max(512); - b.add_input<decl::Float>("Radius Top").min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Radius Bottom").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Depth").default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Int>(N_("Vertices")).default_value(32).min(3).max(512); + b.add_input<decl::Int>(N_("Side Segments")).default_value(1).min(1).max(512); + b.add_input<decl::Int>(N_("Fill Segments")).default_value(1).min(1).max(512); + b.add_input<decl::Float>(N_("Radius Top")).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Radius Bottom")) + .default_value(1.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Depth")).default_value(2.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_mesh_primitive_cone_init(bNodeTree *UNUSED(ntree), bNode *node) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc index f450e310384..3a211993bdc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc @@ -26,11 +26,14 @@ namespace blender::nodes { static void geo_node_mesh_primitive_cube_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Vector>("Size").default_value(float3(1)).min(0.0f).subtype(PROP_TRANSLATION); - b.add_input<decl::Int>("Vertices X").default_value(2).min(2).max(1000); - b.add_input<decl::Int>("Vertices Y").default_value(2).min(2).max(1000); - b.add_input<decl::Int>("Vertices Z").default_value(2).min(2).max(1000); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Vector>(N_("Size")) + .default_value(float3(1)) + .min(0.0f) + .subtype(PROP_TRANSLATION); + b.add_input<decl::Int>(N_("Vertices X")).default_value(2).min(2).max(1000); + b.add_input<decl::Int>(N_("Vertices Y")).default_value(2).min(2).max(1000); + b.add_input<decl::Int>(N_("Vertices Z")).default_value(2).min(2).max(1000); + b.add_output<decl::Geometry>(N_("Mesh")); } struct CuboidConfig { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc index a9c8592d8b6..3bcf42b40b1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc @@ -29,32 +29,32 @@ namespace blender::nodes { static void geo_node_mesh_primitive_cylinder_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Vertices") + b.add_input<decl::Int>(N_("Vertices")) .default_value(32) .min(3) .max(512) - .description("The number of vertices around the circumference"); - b.add_input<decl::Int>("Side Segments") + .description(N_("The number of vertices around the circumference")); + b.add_input<decl::Int>(N_("Side Segments")) .default_value(1) .min(1) .max(512) - .description("The number of segments along the side"); - b.add_input<decl::Int>("Fill Segments") + .description(N_("The number of segments along the side")); + b.add_input<decl::Int>(N_("Fill Segments")) .default_value(1) .min(1) .max(512) - .description("The number of concentric segments of the fill"); - b.add_input<decl::Float>("Radius") + .description(N_("The number of concentric segments of the fill")); + b.add_input<decl::Float>(N_("Radius")) .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description("The radius of the cylinder"); - b.add_input<decl::Float>("Depth") + .description(N_("The radius of the cylinder")); + b.add_input<decl::Float>(N_("Depth")) .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description("The height of the cylinder on the Z axis"); - b.add_output<decl::Geometry>("Mesh"); + .description(N_("The height of the cylinder on the Z axis")); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_mesh_primitive_cylinder_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc index 056b88c0cc8..c4e476981c1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc @@ -29,11 +29,11 @@ namespace blender::nodes { static void geo_node_mesh_primitive_grid_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Size X").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Size Y").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Int>("Vertices X").default_value(3).min(2).max(1000); - b.add_input<decl::Int>("Vertices Y").default_value(3).min(2).max(1000); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Float>(N_("Size X")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Size Y")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Int>(N_("Vertices X")).default_value(3).min(2).max(1000); + b.add_input<decl::Int>(N_("Vertices Y")).default_value(3).min(2).max(1000); + b.add_output<decl::Geometry>(N_("Mesh")); } static void calculate_uvs( diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc index 08da2f458d4..da3dfef3aea 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc @@ -28,9 +28,9 @@ namespace blender::nodes { static void geo_node_mesh_primitive_ico_sphere_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Float>("Radius").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Int>("Subdivisions").default_value(1).min(1).max(7); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Float>(N_("Radius")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Int>(N_("Subdivisions")).default_value(1).min(1).max(7); + b.add_output<decl::Geometry>(N_("Mesh")); } static Mesh *create_ico_sphere_mesh(const int subdivisions, const float radius) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc index 9bf2df4aa4d..6515afe5966 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc @@ -29,11 +29,13 @@ namespace blender::nodes { static void geo_node_mesh_primitive_line_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Count").default_value(10).min(1).max(10000); - b.add_input<decl::Float>("Resolution").default_value(1.0f).min(0.1f).subtype(PROP_DISTANCE); - b.add_input<decl::Vector>("Start Location").subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Offset").default_value({0.0f, 0.0f, 1.0f}).subtype(PROP_TRANSLATION); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Int>(N_("Count")).default_value(10).min(1).max(10000); + b.add_input<decl::Float>(N_("Resolution")).default_value(1.0f).min(0.1f).subtype(PROP_DISTANCE); + b.add_input<decl::Vector>(N_("Start Location")).subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Offset")) + .default_value({0.0f, 0.0f, 1.0f}) + .subtype(PROP_TRANSLATION); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_mesh_primitive_line_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc index 400930d0394..54a762fc15d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc @@ -29,10 +29,10 @@ namespace blender::nodes { static void geo_node_mesh_primitive_uv_shpere_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Int>("Segments").default_value(32).min(3).max(1024); - b.add_input<decl::Int>("Rings").default_value(16).min(2).max(1024); - b.add_input<decl::Float>("Radius").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Int>(N_("Segments")).default_value(32).min(3).max(1024); + b.add_input<decl::Int>(N_("Rings")).default_value(16).min(2).max(1024); + b.add_input<decl::Float>(N_("Radius")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Mesh")); } static int sphere_vert_total(const int segments, const int rings) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc index 2a243d6b8e3..d99c0c851a8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void geo_node_mesh_subdivide_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Int>("Level").default_value(1).min(0).max(6); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Int>(N_("Level")).default_value(1).min(0).max(6); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geometry_set_mesh_subdivide(GeometrySet &geometry_set, const int level) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc index 761581ca5d6..11865c635b8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc @@ -22,9 +22,9 @@ namespace blender::nodes { static void geo_node_legacy_mesh_to_curve_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_legacy_mesh_to_curve_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc index 0a4c0638e27..92911e89f59 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc @@ -30,15 +30,15 @@ namespace blender::nodes { static void geo_node_mesh_to_points_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).supports_field().hide_value(); - b.add_input<decl::Vector>("Position").implicit_field(); - b.add_input<decl::Float>("Radius") + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).supports_field().hide_value(); + b.add_input<decl::Vector>(N_("Position")).implicit_field(); + b.add_input<decl::Float>(N_("Radius")) .default_value(0.05f) .min(0.0f) .subtype(PROP_DISTANCE) .supports_field(); - b.add_output<decl::Geometry>("Points"); + b.add_output<decl::Geometry>(N_("Points")); } static void geo_node_mesh_to_points_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc index e61709ed86a..3ba32c4b674 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -25,15 +25,15 @@ namespace blender::nodes { static void geo_node_object_info_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Object>("Object").hide_label(); - b.add_input<decl::Bool>("As Instance") + b.add_input<decl::Object>(N_("Object")).hide_label(); + b.add_input<decl::Bool>(N_("As Instance")) .description( - "Output the entire object as single instance. " - "This allows instancing non-geometry object types"); - b.add_output<decl::Vector>("Location"); - b.add_output<decl::Vector>("Rotation"); - b.add_output<decl::Vector>("Scale"); - b.add_output<decl::Geometry>("Geometry"); + N_("Output the entire object as single instance. " + "This allows instancing non-geometry object types")); + b.add_output<decl::Vector>(N_("Location")); + b.add_output<decl::Vector>(N_("Rotation")); + b.add_output<decl::Vector>(N_("Scale")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_object_info_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_vertices.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_vertices.cc index d16af8481f0..3e0096824d3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_vertices.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_vertices.cc @@ -27,9 +27,9 @@ namespace blender::nodes { static void geo_node_points_to_vertices_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Points").supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); - b.add_input<decl::Bool>("Selection").default_value(true).supports_field().hide_value(); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Points")).supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).supports_field().hide_value(); + b.add_output<decl::Geometry>(N_("Mesh")); } template<typename T> diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc index 6f68be439b3..fcd82170a8a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc @@ -32,16 +32,16 @@ namespace blender::nodes { static void geo_node_points_to_volume_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Points").supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); - b.add_input<decl::Float>("Density").default_value(1.0f).min(0.0f); - b.add_input<decl::Float>("Voxel Size").default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Voxel Amount").default_value(64.0f).min(0.0f); - b.add_input<decl::Float>("Radius") + b.add_input<decl::Geometry>(N_("Points")).supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); + b.add_input<decl::Float>(N_("Density")).default_value(1.0f).min(0.0f); + b.add_input<decl::Float>(N_("Voxel Size")).default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Voxel Amount")).default_value(64.0f).min(0.0f); + b.add_input<decl::Float>(N_("Radius")) .default_value(0.5f) .min(0.0f) .subtype(PROP_DISTANCE) .supports_field(); - b.add_output<decl::Geometry>("Volume"); + b.add_output<decl::Geometry>(N_("Volume")); } static void geo_node_points_to_volume_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc index f3840df52aa..c05476b982b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc @@ -31,11 +31,12 @@ namespace blender::nodes { static void geo_node_proximity_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Target").only_realized_data().supported_type( - {GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); - b.add_input<decl::Vector>("Source Position").implicit_field(); - b.add_output<decl::Vector>("Position").dependent_field(); - b.add_output<decl::Float>("Distance").dependent_field(); + b.add_input<decl::Geometry>(N_("Target")) + .only_realized_data() + .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); + b.add_input<decl::Vector>(N_("Source Position")).implicit_field(); + b.add_output<decl::Vector>(N_("Position")).dependent_field(); + b.add_output<decl::Float>(N_("Distance")).dependent_field(); } static void geo_node_proximity_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc index 7040b47db1c..34946b1115c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc @@ -31,34 +31,36 @@ namespace blender::nodes { static void geo_node_raycast_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Target Geometry") + b.add_input<decl::Geometry>(N_("Target Geometry")) .only_realized_data() .supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Vector>("Attribute").hide_value().supports_field(); - b.add_input<decl::Float>("Attribute", "Attribute_001").hide_value().supports_field(); - b.add_input<decl::Color>("Attribute", "Attribute_002").hide_value().supports_field(); - b.add_input<decl::Bool>("Attribute", "Attribute_003").hide_value().supports_field(); - b.add_input<decl::Int>("Attribute", "Attribute_004").hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Attribute")).hide_value().supports_field(); + b.add_input<decl::Float>(N_("Attribute"), "Attribute_001").hide_value().supports_field(); + b.add_input<decl::Color>(N_("Attribute"), "Attribute_002").hide_value().supports_field(); + b.add_input<decl::Bool>(N_("Attribute"), "Attribute_003").hide_value().supports_field(); + b.add_input<decl::Int>(N_("Attribute"), "Attribute_004").hide_value().supports_field(); - b.add_input<decl::Vector>("Source Position").implicit_field(); - b.add_input<decl::Vector>("Ray Direction").default_value({0.0f, 0.0f, -1.0f}).supports_field(); - b.add_input<decl::Float>("Ray Length") + b.add_input<decl::Vector>(N_("Source Position")).implicit_field(); + b.add_input<decl::Vector>(N_("Ray Direction")) + .default_value({0.0f, 0.0f, -1.0f}) + .supports_field(); + b.add_input<decl::Float>(N_("Ray Length")) .default_value(100.0f) .min(0.0f) .subtype(PROP_DISTANCE) .supports_field(); - b.add_output<decl::Bool>("Is Hit").dependent_field(); - b.add_output<decl::Vector>("Hit Position").dependent_field(); - b.add_output<decl::Vector>("Hit Normal").dependent_field(); - b.add_output<decl::Float>("Hit Distance").dependent_field(); + b.add_output<decl::Bool>(N_("Is Hit")).dependent_field(); + b.add_output<decl::Vector>(N_("Hit Position")).dependent_field(); + b.add_output<decl::Vector>(N_("Hit Normal")).dependent_field(); + b.add_output<decl::Float>(N_("Hit Distance")).dependent_field(); - b.add_output<decl::Vector>("Attribute").dependent_field({1, 2, 3, 4, 5, 6}); - b.add_output<decl::Float>("Attribute", "Attribute_001").dependent_field({1, 2, 3, 4, 5, 6}); - b.add_output<decl::Color>("Attribute", "Attribute_002").dependent_field({1, 2, 3, 4, 5, 6}); - b.add_output<decl::Bool>("Attribute", "Attribute_003").dependent_field({1, 2, 3, 4, 5, 6}); - b.add_output<decl::Int>("Attribute", "Attribute_004").dependent_field({1, 2, 3, 4, 5, 6}); + b.add_output<decl::Vector>(N_("Attribute")).dependent_field({1, 2, 3, 4, 5, 6}); + b.add_output<decl::Float>(N_("Attribute"), "Attribute_001").dependent_field({1, 2, 3, 4, 5, 6}); + b.add_output<decl::Color>(N_("Attribute"), "Attribute_002").dependent_field({1, 2, 3, 4, 5, 6}); + b.add_output<decl::Bool>(N_("Attribute"), "Attribute_003").dependent_field({1, 2, 3, 4, 5, 6}); + b.add_output<decl::Int>(N_("Attribute"), "Attribute_004").dependent_field({1, 2, 3, 4, 5, 6}); } static void geo_node_raycast_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc index 3be79d5ba3b..6c51c1f738f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc @@ -23,8 +23,8 @@ namespace blender::nodes { static void geo_node_realize_instances_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_output<decl::Geometry>(N_("Geometry")); } static void geo_node_realize_instances_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc index 69d96e0e84e..26814e27d33 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc @@ -22,12 +22,12 @@ namespace blender::nodes { static void geo_node_rotate_instances_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Instances").only_instances(); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("Rotation").subtype(PROP_EULER).supports_field(); - b.add_input<decl::Vector>("Pivot Point").subtype(PROP_TRANSLATION).supports_field(); - b.add_input<decl::Bool>("Local Space").default_value(true).supports_field(); - b.add_output<decl::Geometry>("Instances"); + b.add_input<decl::Geometry>(N_("Instances")).only_instances(); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER).supports_field(); + b.add_input<decl::Vector>(N_("Pivot Point")).subtype(PROP_TRANSLATION).supports_field(); + b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field(); + b.add_output<decl::Geometry>(N_("Instances")); }; static void rotate_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component) diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc index eeaefcdc26e..ea2b458410e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc @@ -22,12 +22,15 @@ namespace blender::nodes { static void geo_node_scale_instances_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Instances").only_instances(); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("Scale").subtype(PROP_XYZ).default_value({1, 1, 1}).supports_field(); - b.add_input<decl::Vector>("Center").subtype(PROP_TRANSLATION).supports_field(); - b.add_input<decl::Bool>("Local Space").default_value(true).supports_field(); - b.add_output<decl::Geometry>("Instances"); + b.add_input<decl::Geometry>(N_("Instances")).only_instances(); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Scale")) + .subtype(PROP_XYZ) + .default_value({1, 1, 1}) + .supports_field(); + b.add_input<decl::Vector>(N_("Center")).subtype(PROP_TRANSLATION).supports_field(); + b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field(); + b.add_output<decl::Geometry>(N_("Instances")); }; static void scale_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component) diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc index dafd10cee2d..a16fb712b13 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc @@ -20,12 +20,12 @@ namespace blender::nodes { static void geo_node_join_geometry_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_output<decl::Geometry>("Mesh"); - b.add_output<decl::Geometry>("Point Cloud"); - b.add_output<decl::Geometry>("Curve"); - b.add_output<decl::Geometry>("Volume"); - b.add_output<decl::Geometry>("Instances"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_output<decl::Geometry>(N_("Mesh")); + b.add_output<decl::Geometry>(N_("Point Cloud")); + b.add_output<decl::Geometry>(N_("Curve")); + b.add_output<decl::Geometry>(N_("Volume")); + b.add_output<decl::Geometry>(N_("Instances")); } static void geo_node_separate_components_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc index 970d49e0626..28e214c0ccc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc @@ -23,16 +23,16 @@ namespace blender::nodes { static void geo_node_separate_geometry_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Bool>("Selection") + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Bool>(N_("Selection")) .default_value(true) .hide_value() .supports_field() - .description("The parts of the geometry that go into the first output"); - b.add_output<decl::Geometry>("Selection") - .description("The parts of the geometry in the selection"); - b.add_output<decl::Geometry>("Inverted") - .description("The parts of the geometry not in the selection"); + .description(N_("The parts of the geometry that go into the first output")); + b.add_output<decl::Geometry>(N_("Selection")) + .description(N_("The parts of the geometry in the selection")); + b.add_output<decl::Geometry>(N_("Inverted")) + .description(N_("The parts of the geometry not in the selection")); } static void geo_node_separate_geometry_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc index a744754382a..b64aa266330 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc @@ -25,10 +25,10 @@ namespace blender::nodes { static void geo_node_set_curve_handles_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("Position").implicit_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Position")).implicit_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static void geo_node_set_curve_handles_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_radius.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_radius.cc index bad81c54553..e47ce7dea30 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_radius.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_radius.cc @@ -20,11 +20,14 @@ namespace blender::nodes { static void geo_node_set_curve_radius_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Float>("Radius").min(0.0f).default_value(1.0f).supports_field().subtype( - PROP_DISTANCE); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Float>(N_("Radius")) + .min(0.0f) + .default_value(1.0f) + .supports_field() + .subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Curve")); } static void set_radius_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc index 670d396dbc6..dde6d0bab92 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc @@ -20,10 +20,10 @@ namespace blender::nodes { static void geo_node_set_curve_tilt_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Float>("Tilt").subtype(PROP_ANGLE).supports_field(); - b.add_output<decl::Geometry>("Curve"); + b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Float>(N_("Tilt")).subtype(PROP_ANGLE).supports_field(); + b.add_output<decl::Geometry>(N_("Curve")); } static void set_tilt_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_id.cc b/source/blender/nodes/geometry/nodes/node_geo_set_id.cc index 7a3b91a17b0..77d8e786501 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_id.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_id.cc @@ -20,10 +20,10 @@ namespace blender::nodes { static void geo_node_set_id_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Int>("ID").implicit_field(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Int>(N_("ID")).implicit_field(); + b.add_output<decl::Geometry>(N_("Geometry")); } static void set_id_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc index dab872a0440..040509ad6d1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void geo_node_set_material_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Material>("Material").hide_label(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Material>(N_("Material")).hide_label(); + b.add_output<decl::Geometry>(N_("Geometry")); } static void assign_material_to_faces(Mesh &mesh, const IndexMask selection, Material *material) diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc index d77f4f4fbaa..a8bb1bd8644 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc @@ -20,10 +20,10 @@ namespace blender::nodes { static void geo_node_set_material_index_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Int>("Material Index").supports_field().min(0); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Int>(N_("Material Index")).supports_field().min(0); + b.add_output<decl::Geometry>(N_("Geometry")); } static void set_material_index_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc b/source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc index 791bc8cde6c..9ff299542b4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc @@ -20,11 +20,14 @@ namespace blender::nodes { static void geo_node_set_point_radius_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Points").supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Float>("Radius").default_value(0.05f).min(0.0f).supports_field().subtype( - PROP_DISTANCE); - b.add_output<decl::Geometry>("Points"); + b.add_input<decl::Geometry>(N_("Points")).supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Float>(N_("Radius")) + .default_value(0.05f) + .min(0.0f) + .supports_field() + .subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Points")); } static void set_radius_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc index a20f14e1ee3..4e564386a28 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc @@ -22,11 +22,11 @@ namespace blender::nodes { static void geo_node_set_position_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("Position").implicit_field(); - b.add_input<decl::Vector>("Offset").supports_field().subtype(PROP_TRANSLATION); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Position")).implicit_field(); + b.add_input<decl::Vector>(N_("Offset")).supports_field().subtype(PROP_TRANSLATION); + b.add_output<decl::Geometry>(N_("Geometry")); } static void set_position_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_shade_smooth.cc b/source/blender/nodes/geometry/nodes/node_geo_set_shade_smooth.cc index c88264ebe94..06e25c2ed55 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_shade_smooth.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_shade_smooth.cc @@ -20,10 +20,10 @@ namespace blender::nodes { static void geo_node_set_shade_smooth_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Bool>("Shade Smooth").supports_field().default_value(true); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Bool>(N_("Shade Smooth")).supports_field().default_value(true); + b.add_output<decl::Geometry>(N_("Geometry")); } static void set_smooth_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_spline_cyclic.cc b/source/blender/nodes/geometry/nodes/node_geo_set_spline_cyclic.cc index 03eb67ac021..ec751ae1d2b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_spline_cyclic.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_spline_cyclic.cc @@ -20,10 +20,10 @@ namespace blender::nodes { static void geo_node_set_spline_cyclic_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Bool>("Cyclic").supports_field(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Bool>(N_("Cyclic")).supports_field(); + b.add_output<decl::Geometry>(N_("Geometry")); } static void set_cyclic_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc b/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc index c0608c36c2e..ccf419975ca 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc @@ -22,10 +22,10 @@ namespace blender::nodes { static void geo_node_set_spline_resolution_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Int>("Resolution").default_value(12).supports_field(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Int>(N_("Resolution")).default_value(12).supports_field(); + b.add_output<decl::Geometry>(N_("Geometry")); } static void set_resolution_in_component(GeometryComponent &component, diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_join.cc b/source/blender/nodes/geometry/nodes/node_geo_string_join.cc index 515f072e976..98d0aca084a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_join.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_join.cc @@ -20,9 +20,9 @@ namespace blender::nodes { static void geo_node_string_join_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::String>("Delimiter"); - b.add_input<decl::String>("Strings").multi_input().hide_value(); - b.add_output<decl::String>("String"); + b.add_input<decl::String>(N_("Delimiter")); + b.add_input<decl::String>(N_("Strings")).multi_input().hide_value(); + b.add_output<decl::String>(N_("String")); }; static void geo_node_string_join_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc index 83526df3ac2..95e94a22d81 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc @@ -34,18 +34,30 @@ namespace blender::nodes { static void geo_node_string_to_curves_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::String>("String"); - b.add_input<decl::Float>("Size").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Character Spacing") + b.add_input<decl::String>(N_("String")); + b.add_input<decl::Float>(N_("Size")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Character Spacing")) .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Word Spacing").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Line Spacing").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Text Box Width").default_value(0.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Text Box Height").default_value(0.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_output<decl::Geometry>("Curves"); - b.add_output<decl::String>("Remainder"); + b.add_input<decl::Float>(N_("Word Spacing")) + .default_value(1.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Line Spacing")) + .default_value(1.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Text Box Width")) + .default_value(0.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Text Box Height")) + .default_value(0.0f) + .min(0.0f) + .subtype(PROP_DISTANCE); + b.add_output<decl::Geometry>(N_("Curves")); + b.add_output<decl::String>(N_("Remainder")); } static void geo_node_string_to_curves_layout(uiLayout *layout, struct bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc index 57c0dfc5b09..2b3430a5ed0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -31,15 +31,15 @@ namespace blender::nodes { static void geo_node_subdivision_surface_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Int>("Level").default_value(1).min(0).max(6); - b.add_input<decl::Float>("Crease") + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Int>(N_("Level")).default_value(1).min(0).max(6); + b.add_input<decl::Float>(N_("Crease")) .default_value(0.0f) .min(0.0f) .max(1.0f) .supports_field() .subtype(PROP_FACTOR); - b.add_output<decl::Geometry>("Mesh"); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_subdivision_surface_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_switch.cc index 28faf217f64..7e07a552650 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_switch.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_switch.cc @@ -30,51 +30,57 @@ namespace blender::nodes { static void geo_node_switch_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Bool>("Switch").default_value(false).supports_field(); - b.add_input<decl::Bool>("Switch", "Switch_001").default_value(false); - - b.add_input<decl::Float>("False").supports_field(); - b.add_input<decl::Float>("True").supports_field(); - b.add_input<decl::Int>("False", "False_001").min(-100000).max(100000).supports_field(); - b.add_input<decl::Int>("True", "True_001").min(-100000).max(100000).supports_field(); - b.add_input<decl::Bool>("False", "False_002").default_value(false).hide_value().supports_field(); - b.add_input<decl::Bool>("True", "True_002").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("False", "False_003").supports_field(); - b.add_input<decl::Vector>("True", "True_003").supports_field(); - b.add_input<decl::Color>("False", "False_004") + b.add_input<decl::Bool>(N_("Switch")).default_value(false).supports_field(); + b.add_input<decl::Bool>(N_("Switch"), "Switch_001").default_value(false); + + b.add_input<decl::Float>(N_("False")).supports_field(); + b.add_input<decl::Float>(N_("True")).supports_field(); + b.add_input<decl::Int>(N_("False"), "False_001").min(-100000).max(100000).supports_field(); + b.add_input<decl::Int>(N_("True"), "True_001").min(-100000).max(100000).supports_field(); + b.add_input<decl::Bool>(N_("False"), "False_002") + .default_value(false) + .hide_value() + .supports_field(); + b.add_input<decl::Bool>(N_("True"), "True_002") + .default_value(true) + .hide_value() + .supports_field(); + b.add_input<decl::Vector>(N_("False"), "False_003").supports_field(); + b.add_input<decl::Vector>(N_("True"), "True_003").supports_field(); + b.add_input<decl::Color>(N_("False"), "False_004") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .supports_field(); - b.add_input<decl::Color>("True", "True_004") + b.add_input<decl::Color>(N_("True"), "True_004") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .supports_field(); - b.add_input<decl::String>("False", "False_005").supports_field(); - b.add_input<decl::String>("True", "True_005").supports_field(); - - b.add_input<decl::Geometry>("False", "False_006"); - b.add_input<decl::Geometry>("True", "True_006"); - b.add_input<decl::Object>("False", "False_007"); - b.add_input<decl::Object>("True", "True_007"); - b.add_input<decl::Collection>("False", "False_008"); - b.add_input<decl::Collection>("True", "True_008"); - b.add_input<decl::Texture>("False", "False_009"); - b.add_input<decl::Texture>("True", "True_009"); - b.add_input<decl::Material>("False", "False_010"); - b.add_input<decl::Material>("True", "True_010"); - b.add_input<decl::Image>("False", "False_011"); - b.add_input<decl::Image>("True", "True_011"); - - b.add_output<decl::Float>("Output").dependent_field(); - b.add_output<decl::Int>("Output", "Output_001").dependent_field(); - b.add_output<decl::Bool>("Output", "Output_002").dependent_field(); - b.add_output<decl::Vector>("Output", "Output_003").dependent_field(); - b.add_output<decl::Color>("Output", "Output_004").dependent_field(); - b.add_output<decl::String>("Output", "Output_005").dependent_field(); - b.add_output<decl::Geometry>("Output", "Output_006"); - b.add_output<decl::Object>("Output", "Output_007"); - b.add_output<decl::Collection>("Output", "Output_008"); - b.add_output<decl::Texture>("Output", "Output_009"); - b.add_output<decl::Material>("Output", "Output_010"); - b.add_output<decl::Image>("Output", "Output_011"); + b.add_input<decl::String>(N_("False"), "False_005").supports_field(); + b.add_input<decl::String>(N_("True"), "True_005").supports_field(); + + b.add_input<decl::Geometry>(N_("False"), "False_006"); + b.add_input<decl::Geometry>(N_("True"), "True_006"); + b.add_input<decl::Object>(N_("False"), "False_007"); + b.add_input<decl::Object>(N_("True"), "True_007"); + b.add_input<decl::Collection>(N_("False"), "False_008"); + b.add_input<decl::Collection>(N_("True"), "True_008"); + b.add_input<decl::Texture>(N_("False"), "False_009"); + b.add_input<decl::Texture>(N_("True"), "True_009"); + b.add_input<decl::Material>(N_("False"), "False_010"); + b.add_input<decl::Material>(N_("True"), "True_010"); + b.add_input<decl::Image>(N_("False"), "False_011"); + b.add_input<decl::Image>(N_("True"), "True_011"); + + b.add_output<decl::Float>(N_("Output")).dependent_field(); + b.add_output<decl::Int>(N_("Output"), "Output_001").dependent_field(); + b.add_output<decl::Bool>(N_("Output"), "Output_002").dependent_field(); + b.add_output<decl::Vector>(N_("Output"), "Output_003").dependent_field(); + b.add_output<decl::Color>(N_("Output"), "Output_004").dependent_field(); + b.add_output<decl::String>(N_("Output"), "Output_005").dependent_field(); + b.add_output<decl::Geometry>(N_("Output"), "Output_006"); + b.add_output<decl::Object>(N_("Output"), "Output_007"); + b.add_output<decl::Collection>(N_("Output"), "Output_008"); + b.add_output<decl::Texture>(N_("Output"), "Output_009"); + b.add_output<decl::Material>(N_("Output"), "Output_010"); + b.add_output<decl::Image>(N_("Output"), "Output_011"); } static void geo_node_switch_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc index d52f028c38c..a889678537f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc @@ -40,23 +40,24 @@ namespace blender::nodes { static void geo_node_transfer_attribute_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Target").only_realized_data().supported_type( - {GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); - - b.add_input<decl::Vector>("Attribute").hide_value().supports_field(); - b.add_input<decl::Float>("Attribute", "Attribute_001").hide_value().supports_field(); - b.add_input<decl::Color>("Attribute", "Attribute_002").hide_value().supports_field(); - b.add_input<decl::Bool>("Attribute", "Attribute_003").hide_value().supports_field(); - b.add_input<decl::Int>("Attribute", "Attribute_004").hide_value().supports_field(); - - b.add_input<decl::Vector>("Source Position").implicit_field(); - b.add_input<decl::Int>("Index").implicit_field(); - - b.add_output<decl::Vector>("Attribute").dependent_field({6, 7}); - b.add_output<decl::Float>("Attribute", "Attribute_001").dependent_field({6, 7}); - b.add_output<decl::Color>("Attribute", "Attribute_002").dependent_field({6, 7}); - b.add_output<decl::Bool>("Attribute", "Attribute_003").dependent_field({6, 7}); - b.add_output<decl::Int>("Attribute", "Attribute_004").dependent_field({6, 7}); + b.add_input<decl::Geometry>(N_("Target")) + .only_realized_data() + .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); + + b.add_input<decl::Vector>(N_("Attribute")).hide_value().supports_field(); + b.add_input<decl::Float>(N_("Attribute"), "Attribute_001").hide_value().supports_field(); + b.add_input<decl::Color>(N_("Attribute"), "Attribute_002").hide_value().supports_field(); + b.add_input<decl::Bool>(N_("Attribute"), "Attribute_003").hide_value().supports_field(); + b.add_input<decl::Int>(N_("Attribute"), "Attribute_004").hide_value().supports_field(); + + b.add_input<decl::Vector>(N_("Source Position")).implicit_field(); + b.add_input<decl::Int>(N_("Index")).implicit_field(); + + b.add_output<decl::Vector>(N_("Attribute")).dependent_field({6, 7}); + b.add_output<decl::Float>(N_("Attribute"), "Attribute_001").dependent_field({6, 7}); + b.add_output<decl::Color>(N_("Attribute"), "Attribute_002").dependent_field({6, 7}); + b.add_output<decl::Bool>(N_("Attribute"), "Attribute_003").dependent_field({6, 7}); + b.add_output<decl::Int>(N_("Attribute"), "Attribute_004").dependent_field({6, 7}); } static void geo_node_transfer_attribute_layout(uiLayout *layout, diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc index 005714a9580..2c55a255b5d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc @@ -37,11 +37,11 @@ namespace blender::nodes { static void geo_node_transform_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Vector>("Translation").subtype(PROP_TRANSLATION); - b.add_input<decl::Vector>("Rotation").subtype(PROP_EULER); - b.add_input<decl::Vector>("Scale").default_value({1, 1, 1}).subtype(PROP_XYZ); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Vector>(N_("Translation")).subtype(PROP_TRANSLATION); + b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER); + b.add_input<decl::Vector>(N_("Scale")).default_value({1, 1, 1}).subtype(PROP_XYZ); + b.add_output<decl::Geometry>(N_("Geometry")); } static bool use_translate(const float3 rotation, const float3 scale) diff --git a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc index d4aa7a327da..fa05d858a07 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc @@ -22,11 +22,11 @@ namespace blender::nodes { static void geo_node_translate_instances_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Instances").only_instances(); - b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field(); - b.add_input<decl::Vector>("Translation").subtype(PROP_TRANSLATION).supports_field(); - b.add_input<decl::Bool>("Local Space").default_value(true).supports_field(); - b.add_output<decl::Geometry>("Instances"); + b.add_input<decl::Geometry>(N_("Instances")).only_instances(); + b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); + b.add_input<decl::Vector>(N_("Translation")).subtype(PROP_TRANSLATION).supports_field(); + b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field(); + b.add_output<decl::Geometry>(N_("Instances")); }; static void translate_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component) diff --git a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc index 1b2201c791a..c869846e1f8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc @@ -31,9 +31,9 @@ namespace blender::nodes { static void geo_node_triangulate_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input<decl::Int>("Minimum Vertices").default_value(4).min(4).max(10000); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input<decl::Int>(N_("Minimum Vertices")).default_value(4).min(4).max(10000); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_triangulate_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc index 920a6e1ed5d..194d1a751ed 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc @@ -22,12 +22,12 @@ namespace blender::nodes { static void geo_node_viewer_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry"); - b.add_input<decl::Float>("Value").supports_field().hide_value(); - b.add_input<decl::Vector>("Value", "Value_001").supports_field().hide_value(); - b.add_input<decl::Color>("Value", "Value_002").supports_field().hide_value(); - b.add_input<decl::Int>("Value", "Value_003").supports_field().hide_value(); - b.add_input<decl::Bool>("Value", "Value_004").supports_field().hide_value(); + b.add_input<decl::Geometry>(N_("Geometry")); + b.add_input<decl::Float>(N_("Value")).supports_field().hide_value(); + b.add_input<decl::Vector>(N_("Value"), "Value_001").supports_field().hide_value(); + b.add_input<decl::Color>(N_("Value"), "Value_002").supports_field().hide_value(); + b.add_input<decl::Int>(N_("Value"), "Value_003").supports_field().hide_value(); + b.add_input<decl::Bool>(N_("Value"), "Value_004").supports_field().hide_value(); } static void geo_node_viewer_init(bNodeTree *UNUSED(tree), bNode *node) diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index a8c92eb0f07..416d502dc59 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -39,12 +39,12 @@ namespace blender::nodes { static void geo_node_volume_to_mesh_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Volume").supported_type(GEO_COMPONENT_TYPE_VOLUME); - b.add_input<decl::Float>("Voxel Size").default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); - b.add_input<decl::Float>("Voxel Amount").default_value(64.0f).min(0.0f); - b.add_input<decl::Float>("Threshold").default_value(0.1f).min(0.0f); - b.add_input<decl::Float>("Adaptivity").min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output<decl::Geometry>("Mesh"); + b.add_input<decl::Geometry>(N_("Volume")).supported_type(GEO_COMPONENT_TYPE_VOLUME); + b.add_input<decl::Float>(N_("Voxel Size")).default_value(0.3f).min(0.01f).subtype(PROP_DISTANCE); + b.add_input<decl::Float>(N_("Voxel Amount")).default_value(64.0f).min(0.0f); + b.add_input<decl::Float>(N_("Threshold")).default_value(0.1f).min(0.0f); + b.add_input<decl::Float>(N_("Adaptivity")).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output<decl::Geometry>(N_("Mesh")); } static void geo_node_volume_to_mesh_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc index e8d4239937f..57a992a4275 100644 --- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void sh_node_clamp_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Value").min(0.0f).max(1.0f).default_value(1.0f); - b.add_input<decl::Float>("Min").default_value(0.0f).min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Max").default_value(1.0f).min(-10000.0f).max(10000.0f); - b.add_output<decl::Float>("Result"); + b.add_input<decl::Float>(N_("Value")).min(0.0f).max(1.0f).default_value(1.0f); + b.add_input<decl::Float>(N_("Min")).default_value(0.0f).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f); + b.add_output<decl::Float>(N_("Result")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc index 875e6fa0c35..f8f0ee97eae 100644 --- a/source/blender/nodes/shader/nodes/node_shader_curves.cc +++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc @@ -28,9 +28,9 @@ namespace blender::nodes { static void sh_node_curve_vec_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Fac").min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Vector>("Vector").min(-1.0f).max(1.0f); - b.add_output<decl::Vector>("Vector"); + b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Vector>(N_("Vector")).min(-1.0f).max(1.0f); + b.add_output<decl::Vector>(N_("Vector")); }; } // namespace blender::nodes @@ -175,9 +175,9 @@ namespace blender::nodes { static void sh_node_curve_rgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Fac").min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Color>("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output<decl::Color>("Color"); + b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Color>(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output<decl::Color>(N_("Color")); }; } // namespace blender::nodes @@ -352,9 +352,13 @@ namespace blender::nodes { static void sh_node_curve_float_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Factor").min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Float>("Value").default_value(1.0f); - b.add_output<decl::Float>("Value"); + b.add_input<decl::Float>(N_("Factor")) + .min(0.0f) + .max(1.0f) + .default_value(1.0f) + .subtype(PROP_FACTOR); + b.add_input<decl::Float>(N_("Value")).default_value(1.0f); + b.add_output<decl::Float>(N_("Value")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_map_range.cc b/source/blender/nodes/shader/nodes/node_shader_map_range.cc index 5ea194ddc83..c866a154e8c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -30,13 +30,13 @@ namespace blender::nodes { static void sh_node_map_range_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Value").min(-10000.0f).max(10000.0f).default_value(1.0f); - b.add_input<decl::Float>("From Min").min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("From Max").min(-10000.0f).max(10000.0f).default_value(1.0f); - b.add_input<decl::Float>("To Min").min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("To Max").min(-10000.0f).max(10000.0f).default_value(1.0f); - b.add_input<decl::Float>("Steps").min(-10000.0f).max(10000.0f).default_value(4.0f); - b.add_output<decl::Float>("Result"); + b.add_input<decl::Float>(N_("Value")).min(-10000.0f).max(10000.0f).default_value(1.0f); + b.add_input<decl::Float>(N_("From Min")).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("From Max")).min(-10000.0f).max(10000.0f).default_value(1.0f); + b.add_input<decl::Float>(N_("To Min")).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("To Max")).min(-10000.0f).max(10000.0f).default_value(1.0f); + b.add_input<decl::Float>(N_("Steps")).min(-10000.0f).max(10000.0f).default_value(4.0f); + b.add_output<decl::Float>(N_("Result")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc index 96d1be49c04..284a5f1189f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_math.cc @@ -32,10 +32,16 @@ namespace blender::nodes { static void sh_node_math_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Value").default_value(0.5f).min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Value", "Value_001").default_value(0.5f).min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Value", "Value_002").default_value(0.5f).min(-10000.0f).max(10000.0f); - b.add_output<decl::Float>("Value"); + b.add_input<decl::Float>(N_("Value")).default_value(0.5f).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("Value"), "Value_001") + .default_value(0.5f) + .min(-10000.0f) + .max(10000.0f); + b.add_input<decl::Float>(N_("Value"), "Value_002") + .default_value(0.5f) + .min(-10000.0f) + .max(10000.0f); + b.add_output<decl::Float>(N_("Value")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc b/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc index d4d02e80ada..06fafff578e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void sh_node_mix_rgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Fac").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input<decl::Color>("Color1").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_input<decl::Color>("Color2").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_output<decl::Color>("Color"); + b.add_input<decl::Float>(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input<decl::Color>(N_("Color1")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_input<decl::Color>(N_("Color2")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output<decl::Color>(N_("Color")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc b/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc index 24c5dcf7ba3..08a9e01786e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void sh_node_seprgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Color>("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output<decl::Float>("R"); - b.add_output<decl::Float>("G"); - b.add_output<decl::Float>("B"); + b.add_input<decl::Color>(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output<decl::Float>(N_("R")); + b.add_output<decl::Float>(N_("G")); + b.add_output<decl::Float>(N_("B")); }; } // namespace blender::nodes @@ -121,10 +121,10 @@ namespace blender::nodes { static void sh_node_combrgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("R").min(0.0f).max(1.0f); - b.add_input<decl::Float>("G").min(0.0f).max(1.0f); - b.add_input<decl::Float>("B").min(0.0f).max(1.0f); - b.add_output<decl::Color>("Image"); + b.add_input<decl::Float>(N_("R")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("G")).min(0.0f).max(1.0f); + b.add_input<decl::Float>(N_("B")).min(0.0f).max(1.0f); + b.add_output<decl::Color>(N_("Image")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc b/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc index 8ca8fc19521..1bbfa629462 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc @@ -28,10 +28,10 @@ namespace blender::nodes { static void sh_node_sepxyz_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").min(-10000.0f).max(10000.0f); - b.add_output<decl::Float>("X"); - b.add_output<decl::Float>("Y"); - b.add_output<decl::Float>("Z"); + b.add_input<decl::Vector>(N_("Vector")).min(-10000.0f).max(10000.0f); + b.add_output<decl::Float>(N_("X")); + b.add_output<decl::Float>(N_("Y")); + b.add_output<decl::Float>(N_("Z")); }; } // namespace blender::nodes @@ -105,10 +105,10 @@ namespace blender::nodes { static void sh_node_combxyz_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("X").min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Y").min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Z").min(-10000.0f).max(10000.0f); - b.add_output<decl::Vector>("Vector"); + b.add_input<decl::Float>(N_("X")).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("Y")).min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("Z")).min(-10000.0f).max(10000.0f); + b.add_output<decl::Vector>(N_("Vector")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc index ab5199c5fac..b840bd75e42 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc @@ -27,34 +27,34 @@ namespace blender::nodes { static void sh_node_tex_brick_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").min(-10000.0f).max(10000.0f).implicit_field(); - b.add_input<decl::Color>("Color1").default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input<decl::Color>("Color2").default_value({0.2f, 0.2f, 0.2f, 1.0f}); - b.add_input<decl::Color>("Mortar").default_value({0.0f, 0.0f, 0.0f, 1.0f}).no_muted_links(); - b.add_input<decl::Float>("Scale") + b.add_input<decl::Vector>(N_("Vector")).min(-10000.0f).max(10000.0f).implicit_field(); + b.add_input<decl::Color>(N_("Color1")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input<decl::Color>(N_("Color2")).default_value({0.2f, 0.2f, 0.2f, 1.0f}); + b.add_input<decl::Color>(N_("Mortar")).default_value({0.0f, 0.0f, 0.0f, 1.0f}).no_muted_links(); + b.add_input<decl::Float>(N_("Scale")) .min(-1000.0f) .max(1000.0f) .default_value(5.0f) .no_muted_links(); - b.add_input<decl::Float>("Mortar Size") + b.add_input<decl::Float>(N_("Mortar Size")) .min(0.0f) .max(0.125f) .default_value(0.02f) .no_muted_links(); - b.add_input<decl::Float>("Mortar Smooth").min(0.0f).max(1.0f).no_muted_links(); - b.add_input<decl::Float>("Bias").min(-1.0f).max(1.0f).no_muted_links(); - b.add_input<decl::Float>("Brick Width") + b.add_input<decl::Float>(N_("Mortar Smooth")).min(0.0f).max(1.0f).no_muted_links(); + b.add_input<decl::Float>(N_("Bias")).min(-1.0f).max(1.0f).no_muted_links(); + b.add_input<decl::Float>(N_("Brick Width")) .min(0.01f) .max(100.0f) .default_value(0.5f) .no_muted_links(); - b.add_input<decl::Float>("Row Height") + b.add_input<decl::Float>(N_("Row Height")) .min(0.01f) .max(100.0f) .default_value(0.25f) .no_muted_links(); - b.add_output<decl::Color>("Color"); - b.add_output<decl::Float>("Fac"); + b.add_output<decl::Color>(N_("Color")); + b.add_output<decl::Float>(N_("Fac")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc index 7ba468a93e0..7c1223a6a32 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc @@ -24,16 +24,16 @@ namespace blender::nodes { static void sh_node_tex_checker_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").min(-10000.0f).max(10000.0f).implicit_field(); - b.add_input<decl::Color>("Color1").default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input<decl::Color>("Color2").default_value({0.2f, 0.2f, 0.2f, 1.0f}); - b.add_input<decl::Float>("Scale") + b.add_input<decl::Vector>(N_("Vector")).min(-10000.0f).max(10000.0f).implicit_field(); + b.add_input<decl::Color>(N_("Color1")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input<decl::Color>(N_("Color2")).default_value({0.2f, 0.2f, 0.2f, 1.0f}); + b.add_input<decl::Float>(N_("Scale")) .min(-10000.0f) .max(10000.0f) .default_value(5.0f) .no_muted_links(); - b.add_output<decl::Color>("Color"); - b.add_output<decl::Float>("Fac"); + b.add_output<decl::Color>(N_("Color")); + b.add_output<decl::Float>(N_("Fac")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc index 4796af02361..33832c42b3c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc @@ -24,9 +24,9 @@ namespace blender::nodes { static void sh_node_tex_gradient_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").hide_value().implicit_field(); - b.add_output<decl::Color>("Color").no_muted_links(); - b.add_output<decl::Float>("Fac").no_muted_links(); + b.add_input<decl::Vector>(N_("Vector")).hide_value().implicit_field(); + b.add_output<decl::Color>(N_("Color")).no_muted_links(); + b.add_output<decl::Float>(N_("Fac")).no_muted_links(); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc index df1051c07b4..f20fc85cbe0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc @@ -24,9 +24,9 @@ namespace blender::nodes { static void sh_node_tex_image_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").implicit_field(); - b.add_output<decl::Color>("Color").no_muted_links(); - b.add_output<decl::Float>("Alpha").no_muted_links(); + b.add_input<decl::Vector>(N_("Vector")).implicit_field(); + b.add_output<decl::Color>(N_("Color")).no_muted_links(); + b.add_output<decl::Float>(N_("Alpha")).no_muted_links(); }; }; // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc index b6cdcf86528..62e68d53d03 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -24,11 +24,11 @@ namespace blender::nodes { static void sh_node_tex_magic_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").implicit_field(); - b.add_input<decl::Float>("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input<decl::Float>("Distortion").min(-1000.0f).max(1000.0f).default_value(1.0f); - b.add_output<decl::Color>("Color").no_muted_links(); - b.add_output<decl::Float>("Fac").no_muted_links(); + b.add_input<decl::Vector>(N_("Vector")).implicit_field(); + b.add_input<decl::Float>(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(1.0f); + b.add_output<decl::Color>(N_("Color")).no_muted_links(); + b.add_output<decl::Float>(N_("Fac")).no_muted_links(); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc index 61c26d07e2f..3bf4e24ed53 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -26,15 +26,15 @@ namespace blender::nodes { static void sh_node_tex_musgrave_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").hide_value().implicit_field(); - b.add_input<decl::Float>("W").min(-1000.0f).max(1000.0f); - b.add_input<decl::Float>("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input<decl::Float>("Detail").min(0.0f).max(16.0f).default_value(2.0f); - b.add_input<decl::Float>("Dimension").min(0.0f).max(1000.0f).default_value(2.0f); - b.add_input<decl::Float>("Lacunarity").min(0.0f).max(1000.0f).default_value(2.0f); - b.add_input<decl::Float>("Offset").min(-1000.0f).max(1000.0f); - b.add_input<decl::Float>("Gain").min(0.0f).max(1000.0f).default_value(1.0f); - b.add_output<decl::Float>("Fac").no_muted_links(); + b.add_input<decl::Vector>(N_("Vector")).hide_value().implicit_field(); + b.add_input<decl::Float>(N_("W")).min(-1000.0f).max(1000.0f); + b.add_input<decl::Float>(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input<decl::Float>(N_("Detail")).min(0.0f).max(16.0f).default_value(2.0f); + b.add_input<decl::Float>(N_("Dimension")).min(0.0f).max(1000.0f).default_value(2.0f); + b.add_input<decl::Float>(N_("Lacunarity")).min(0.0f).max(1000.0f).default_value(2.0f); + b.add_input<decl::Float>(N_("Offset")).min(-1000.0f).max(1000.0f); + b.add_input<decl::Float>(N_("Gain")).min(0.0f).max(1000.0f).default_value(1.0f); + b.add_output<decl::Float>(N_("Fac")).no_muted_links(); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc index 6ffc8979815..72892c32795 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -26,18 +26,18 @@ namespace blender::nodes { static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").implicit_field(); - b.add_input<decl::Float>("W").min(-1000.0f).max(1000.0f); - b.add_input<decl::Float>("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input<decl::Float>("Detail").min(0.0f).max(16.0f).default_value(2.0f); - b.add_input<decl::Float>("Roughness") + b.add_input<decl::Vector>(N_("Vector")).implicit_field(); + b.add_input<decl::Float>(N_("W")).min(-1000.0f).max(1000.0f); + b.add_input<decl::Float>(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input<decl::Float>(N_("Detail")).min(0.0f).max(16.0f).default_value(2.0f); + b.add_input<decl::Float>(N_("Roughness")) .min(0.0f) .max(1.0f) .default_value(0.5f) .subtype(PROP_FACTOR); - b.add_input<decl::Float>("Distortion").min(-1000.0f).max(1000.0f).default_value(0.0f); - b.add_output<decl::Float>("Fac").no_muted_links(); - b.add_output<decl::Color>("Color").no_muted_links(); + b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(0.0f); + b.add_output<decl::Float>(N_("Fac")).no_muted_links(); + b.add_output<decl::Color>(N_("Color")).no_muted_links(); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc index 9fcc331e486..422268b98c3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc @@ -26,25 +26,25 @@ namespace blender::nodes { static void sh_node_tex_voronoi_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").hide_value().implicit_field(); - b.add_input<decl::Float>("W").min(-1000.0f).max(1000.0f); - b.add_input<decl::Float>("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input<decl::Float>("Smoothness") + b.add_input<decl::Vector>(N_("Vector")).hide_value().implicit_field(); + b.add_input<decl::Float>(N_("W")).min(-1000.0f).max(1000.0f); + b.add_input<decl::Float>(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input<decl::Float>(N_("Smoothness")) .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR); - b.add_input<decl::Float>("Exponent").min(0.0f).max(32.0f).default_value(0.5f); - b.add_input<decl::Float>("Randomness") + b.add_input<decl::Float>(N_("Exponent")).min(0.0f).max(32.0f).default_value(0.5f); + b.add_input<decl::Float>(N_("Randomness")) .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR); - b.add_output<decl::Float>("Distance").no_muted_links(); - b.add_output<decl::Color>("Color").no_muted_links(); - b.add_output<decl::Vector>("Position").no_muted_links(); - b.add_output<decl::Float>("W").no_muted_links(); - b.add_output<decl::Float>("Radius").no_muted_links(); + b.add_output<decl::Float>(N_("Distance")).no_muted_links(); + b.add_output<decl::Color>(N_("Color")).no_muted_links(); + b.add_output<decl::Vector>(N_("Position")).no_muted_links(); + b.add_output<decl::Float>(N_("W")).no_muted_links(); + b.add_output<decl::Float>(N_("Radius")).no_muted_links(); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc index 25e65e3d3f0..144aa1885bd 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc @@ -26,19 +26,19 @@ namespace blender::nodes { static void sh_node_tex_wave_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").implicit_field(); - b.add_input<decl::Float>("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input<decl::Float>("Distortion").min(-1000.0f).max(1000.0f).default_value(0.0f); - b.add_input<decl::Float>("Detail").min(0.0f).max(16.0f).default_value(2.0f); - b.add_input<decl::Float>("Detail Scale").min(-1000.0f).max(1000.0f).default_value(1.0f); - b.add_input<decl::Float>("Detail Roughness") + b.add_input<decl::Vector>(N_("Vector")).implicit_field(); + b.add_input<decl::Float>(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(0.0f); + b.add_input<decl::Float>(N_("Detail")).min(0.0f).max(16.0f).default_value(2.0f); + b.add_input<decl::Float>(N_("Detail Scale")).min(-1000.0f).max(1000.0f).default_value(1.0f); + b.add_input<decl::Float>(N_("Detail Roughness")) .min(0.0f) .max(1.0f) .default_value(0.5f) .subtype(PROP_FACTOR); - b.add_input<decl::Float>("Phase Offset").min(-1000.0f).max(1000.0f).default_value(0.0f); - b.add_output<decl::Color>("Color").no_muted_links(); - b.add_output<decl::Float>("Fac").no_muted_links(); + b.add_input<decl::Float>(N_("Phase Offset")).min(-1000.0f).max(1000.0f).default_value(0.0f); + b.add_output<decl::Color>(N_("Color")).no_muted_links(); + b.add_output<decl::Float>(N_("Fac")).no_muted_links(); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc index 445b201e419..43ee9400551 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc @@ -26,10 +26,10 @@ namespace blender::nodes { static void sh_node_tex_white_noise_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").min(-10000.0f).max(10000.0f).implicit_field(); - b.add_input<decl::Float>("W").min(-10000.0f).max(10000.0f); - b.add_output<decl::Float>("Value"); - b.add_output<decl::Color>("Color"); + b.add_input<decl::Vector>(N_("Vector")).min(-10000.0f).max(10000.0f).implicit_field(); + b.add_input<decl::Float>(N_("W")).min(-10000.0f).max(10000.0f); + b.add_output<decl::Float>(N_("Value")); + b.add_output<decl::Color>(N_("Color")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc b/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc index 2544ea1921c..e4f1b2c76f0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc @@ -34,9 +34,9 @@ namespace blender::nodes { static void sh_node_valtorgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Float>("Fac").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output<decl::Color>("Color"); - b.add_output<decl::Float>("Alpha"); + b.add_input<decl::Float>(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output<decl::Color>(N_("Color")); + b.add_output<decl::Float>(N_("Alpha")); }; } // namespace blender::nodes @@ -192,8 +192,8 @@ namespace blender::nodes { static void sh_node_rgbtobw_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Color>("Color").default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_output<decl::Float>("Val"); + b.add_input<decl::Color>(N_("Color")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output<decl::Float>(N_("Val")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_value.cc b/source/blender/nodes/shader/nodes/node_shader_value.cc index 1344ce5c5d9..b0f152d8526 100644 --- a/source/blender/nodes/shader/nodes/node_shader_value.cc +++ b/source/blender/nodes/shader/nodes/node_shader_value.cc @@ -27,7 +27,7 @@ namespace blender::nodes { static void sh_node_value_declare(NodeDeclarationBuilder &b) { - b.add_output<decl::Float>("Value"); + b.add_output<decl::Float>(N_("Value")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc index f49ff06cef1..ca5aeea9a7d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -30,12 +30,12 @@ namespace blender::nodes { static void sh_node_vector_math_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").min(-10000.0f).max(10000.0f); - b.add_input<decl::Vector>("Vector", "Vector_001").min(-10000.0f).max(10000.0f); - b.add_input<decl::Vector>("Vector", "Vector_002").min(-10000.0f).max(10000.0f); - b.add_input<decl::Float>("Scale").default_value(1.0f).min(-10000.0f).max(10000.0f); - b.add_output<decl::Vector>("Vector"); - b.add_output<decl::Float>("Value"); + b.add_input<decl::Vector>(N_("Vector")).min(-10000.0f).max(10000.0f); + b.add_input<decl::Vector>(N_("Vector"), "Vector_001").min(-10000.0f).max(10000.0f); + b.add_input<decl::Vector>(N_("Vector"), "Vector_002").min(-10000.0f).max(10000.0f); + b.add_input<decl::Float>(N_("Scale")).default_value(1.0f).min(-10000.0f).max(10000.0f); + b.add_output<decl::Vector>(N_("Vector")); + b.add_output<decl::Float>(N_("Value")); }; } // namespace blender::nodes diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc index c9b26fa5199..1ab643bc3fa 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc @@ -28,12 +28,12 @@ namespace blender::nodes { static void sh_node_vector_rotate_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input<decl::Vector>("Vector").min(0.0f).max(1.0f).hide_value(); - b.add_input<decl::Vector>("Center"); - b.add_input<decl::Vector>("Axis").min(-1.0f).max(1.0f).default_value({0.0f, 0.0f, 1.0f}); - b.add_input<decl::Float>("Angle").subtype(PROP_ANGLE); - b.add_input<decl::Vector>("Rotation").subtype(PROP_EULER); - b.add_output<decl::Vector>("Vector"); + b.add_input<decl::Vector>(N_("Vector")).min(0.0f).max(1.0f).hide_value(); + b.add_input<decl::Vector>(N_("Center")); + b.add_input<decl::Vector>(N_("Axis")).min(-1.0f).max(1.0f).default_value({0.0f, 0.0f, 1.0f}); + b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE); + b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER); + b.add_output<decl::Vector>(N_("Vector")); }; } // namespace blender::nodes |