diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc index 9a56810d42d..8691d6cc329 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc @@ -22,19 +22,19 @@ NODE_STORAGE_FUNCS(NodeTwoFloats) static void cmp_node_alphaover_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(2); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Image"), "Image_001") + b.add_input("Image", "Image_001") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_alphaover_init(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc index 346e70df78b..6c6d4be6931 100644 --- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc +++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc @@ -23,10 +23,10 @@ NODE_STORAGE_FUNCS(NodeAntiAliasingData) static void cmp_node_antialiasing_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_antialiasing(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index ca0eae424ab..551b8e3e0e1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -25,13 +25,13 @@ NODE_STORAGE_FUNCS(NodeBilateralBlurData) static void cmp_node_bilateralblur_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Determinator")) + b.add_input("Determinator") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_bilateralblur(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 089a992b206..40bef815165 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -34,15 +34,15 @@ NODE_STORAGE_FUNCS(NodeBlurData) static void cmp_node_blur_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Size")) + b.add_input("Size") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_blur(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index d3563b3311c..66ff6322f12 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -24,23 +24,23 @@ namespace blender::nodes::node_composite_bokehblur_cc { static void cmp_node_bokehblur_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Bokeh")) + b.add_input("Bokeh") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_skip_realization(); - b.add_input(N_("Size")) + b.add_input("Size") .default_value(1.0f) .min(0.0f) .max(10.0f) .compositor_domain_priority(1); - b.add_input(N_("Bounding box")) + b.add_input("Bounding box") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(2); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_bokehblur(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index 56bbcdf25cb..09cff9f5e52 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -26,7 +26,7 @@ NODE_STORAGE_FUNCS(NodeBokehImage) static void cmp_node_bokehimage_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_bokehimage(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc index 959953accad..ac49294e3d3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc @@ -27,17 +27,17 @@ NODE_STORAGE_FUNCS(NodeBoxMask) static void cmp_node_boxmask_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mask")) + b.add_input("Mask") .default_value(0.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_input(N_("Value")) + b.add_input("Value") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(1); - b.add_output(N_("Mask")); + b.add_output("Mask"); } static void node_composit_init_boxmask(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index d8dffcc71ee..3fdd5454040 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -20,12 +20,12 @@ namespace blender::nodes::node_composite_brightness_cc { static void cmp_node_brightcontrast_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Bright")).min(-100.0f).max(100.0f).compositor_domain_priority(1); - b.add_input(N_("Contrast")).min(-100.0f).max(100.0f).compositor_domain_priority(2); - b.add_output(N_("Image")); + b.add_input("Bright").min(-100.0f).max(100.0f).compositor_domain_priority(1); + b.add_input("Contrast").min(-100.0f).max(100.0f).compositor_domain_priority(2); + b.add_output("Image"); } static void node_composit_init_brightcontrast(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc index 3d14fe39139..dcf80d259b5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc @@ -24,11 +24,11 @@ NODE_STORAGE_FUNCS(NodeChroma) static void cmp_node_channel_matte_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); + b.add_output("Image"); + b.add_output("Matte"); } static void node_composit_init_channel_matte(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc index 3c058cce883..d8e48aee221 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc @@ -26,14 +26,14 @@ NODE_STORAGE_FUNCS(NodeChroma) static void cmp_node_chroma_matte_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Key Color")) + b.add_input("Key Color") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); + b.add_output("Image"); + b.add_output("Matte"); } static void node_composit_init_chroma_matte(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc index aabc0565f80..4479634746a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc @@ -22,14 +22,14 @@ NODE_STORAGE_FUNCS(NodeChroma) static void cmp_node_color_matte_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Key Color")) + b.add_input("Key Color") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); + b.add_output("Image"); + b.add_output("Matte"); } static void node_composit_init_color_matte(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc index bfafa2baf33..db392fce4ec 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc @@ -24,16 +24,16 @@ NODE_STORAGE_FUNCS(NodeColorspill) static void cmp_node_color_spill_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_color_spill(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index 28a803dae4f..c7c02be0177 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -52,16 +52,16 @@ NODE_STORAGE_FUNCS(NodeColorBalance) static void cmp_node_colorbalance_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_colorbalance(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 4bca14d718a..865c6f223a6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -24,15 +24,15 @@ NODE_STORAGE_FUNCS(NodeColorCorrection) static void cmp_node_colorcorrection_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Mask")) + b.add_input("Mask") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_colorcorrection(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc index e1348c89173..f1dd1d86cc4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.cc +++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc @@ -25,9 +25,9 @@ namespace blender::nodes::node_composite_composite_cc { static void cmp_node_composite_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("Alpha")).default_value(1.0f).min(0.0f).max(1.0f); - b.add_input(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_input("Image").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("Alpha").default_value(1.0f).min(0.0f).max(1.0f); + b.add_input("Z").default_value(1.0f).min(0.0f).max(1.0f); } static void node_composit_buts_composite(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc index 3522793d099..47d3d01ad4d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc +++ b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc @@ -28,10 +28,10 @@ NODE_STORAGE_FUNCS(NodeConvertColorSpace) static void CMP_NODE_CONVERT_COLOR_SPACE_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_convert_colorspace(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc index e4416fab5f2..05cdd257166 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc @@ -25,31 +25,31 @@ namespace blender::nodes::node_composite_cornerpin_cc { static void cmp_node_cornerpin_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Upper Left")) + b.add_input("Upper Left") .default_value({0.0f, 1.0f, 0.0f}) .min(0.0f) .max(1.0f) .compositor_expects_single_value(); - b.add_input(N_("Upper Right")) + b.add_input("Upper Right") .default_value({1.0f, 1.0f, 0.0f}) .min(0.0f) .max(1.0f) .compositor_expects_single_value(); - b.add_input(N_("Lower Left")) + b.add_input("Lower Left") .default_value({0.0f, 0.0f, 0.0f}) .min(0.0f) .max(1.0f) .compositor_expects_single_value(); - b.add_input(N_("Lower Right")) + b.add_input("Lower Right") .default_value({1.0f, 0.0f, 0.0f}) .min(0.0f) .max(1.0f) .compositor_expects_single_value(); - b.add_output(N_("Image")); - b.add_output(N_("Plane")); + b.add_output("Image"); + b.add_output("Plane"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc index 19729cc2d20..3c65b6d1fda 100644 --- a/source/blender/nodes/composite/nodes/node_composite_crop.cc +++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc @@ -31,10 +31,10 @@ NODE_STORAGE_FUNCS(NodeTwoXYs) static void cmp_node_crop_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_crop(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc index 2e748ce99fa..7ff454aeea3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_curves.cc +++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc @@ -25,7 +25,7 @@ namespace blender::nodes::node_composite_time_curves_cc { static void cmp_node_time_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Fac")); + b.add_output("Fac"); } /* custom1 = start_frame, custom2 = end_frame */ @@ -113,12 +113,12 @@ namespace blender::nodes::node_composite_vector_curves_cc { static void cmp_node_curve_vec_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")) + b.add_input("Vector") .default_value({0.0f, 0.0f, 0.0f}) .min(-1.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_output(N_("Vector")); + b.add_output("Vector"); } static void node_composit_init_curve_vec(bNodeTree * /*ntree*/, bNode *node) @@ -208,18 +208,18 @@ namespace blender::nodes::node_composite_rgb_curves_cc { static void cmp_node_rgbcurves_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(-1.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Black Level")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("White Level")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output(N_("Image")); + b.add_input("Black Level").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("White Level").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output("Image"); } static void node_composit_init_curve_rgb(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc index 47e22fa2886..b52b8d6b5c6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc @@ -24,9 +24,9 @@ namespace blender::nodes::node_composite_defocus_cc { static void cmp_node_defocus_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f); - b.add_output(N_("Image")); + b.add_input("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Z").default_value(1.0f).min(0.0f).max(1.0f); + b.add_output("Image"); } static void node_composit_init_defocus(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc index 235b113bb93..5d3e3fe141b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc +++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc @@ -33,20 +33,20 @@ NODE_STORAGE_FUNCS(NodeDenoise) static void cmp_node_denoise_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Normal")) + b.add_input("Normal") .default_value({0.0f, 0.0f, 0.0f}) .min(-1.0f) .max(1.0f) .hide_value() .compositor_domain_priority(2); - b.add_input(N_("Albedo")) + b.add_input("Albedo") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .hide_value() .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_denonise(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc index ed0ea1268e9..4d5e33684a7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc +++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc @@ -21,16 +21,16 @@ namespace blender::nodes::node_composite_despeckle_cc { static void cmp_node_despeckle_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_despeckle(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc index 3984d0d16cf..0fdef573cce 100644 --- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc @@ -22,14 +22,14 @@ NODE_STORAGE_FUNCS(NodeChroma) static void cmp_node_diff_matte_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image 1")) + b.add_input("Image 1") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Image 2")) + b.add_input("Image 2") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); + b.add_output("Image"); + b.add_output("Matte"); } static void node_composit_init_diff_matte(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc index 8c13a8f3f6d..3fdcfe59afa 100644 --- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc @@ -32,8 +32,8 @@ NODE_STORAGE_FUNCS(NodeDilateErode) static void cmp_node_dilate_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mask")).default_value(0.0f).min(0.0f).max(1.0f); - b.add_output(N_("Mask")); + b.add_input("Mask").default_value(0.0f).min(0.0f).max(1.0f); + b.add_output("Mask"); } static void node_composit_init_dilateerode(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc index 06a637d781f..67ea4a87130 100644 --- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc @@ -24,10 +24,10 @@ NODE_STORAGE_FUNCS(NodeDBlurData) static void cmp_node_directional_blur_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_dblur(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.cc b/source/blender/nodes/composite/nodes/node_composite_displace.cc index b38560268b0..c617442a5a7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_displace.cc +++ b/source/blender/nodes/composite/nodes/node_composite_displace.cc @@ -23,26 +23,26 @@ namespace blender::nodes::node_composite_displace_cc { static void cmp_node_displace_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Vector")) + b.add_input("Vector") .default_value({1.0f, 1.0f, 1.0f}) .min(0.0f) .max(1.0f) .subtype(PROP_TRANSLATION) .compositor_domain_priority(1); - b.add_input(N_("X Scale")) + b.add_input("X Scale") .default_value(0.0f) .min(-1000.0f) .max(1000.0f) .compositor_domain_priority(2); - b.add_input(N_("Y Scale")) + b.add_input("Y Scale") .default_value(0.0f) .min(-1000.0f) .max(1000.0f) .compositor_domain_priority(3); - b.add_output(N_("Image")); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc index 7bf573b67c2..b25b42507af 100644 --- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc @@ -22,14 +22,14 @@ NODE_STORAGE_FUNCS(NodeChroma) static void cmp_node_distance_matte_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Key Color")) + b.add_input("Key Color") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); + b.add_output("Image"); + b.add_output("Matte"); } static void node_composit_init_distance_matte(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc index 6a118fb34b5..b956a598c08 100644 --- a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc @@ -20,9 +20,9 @@ namespace blender::nodes::node_composite_double_edge_mask_cc { static void cmp_node_double_edge_mask_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Inner Mask")).default_value(0.8f).min(0.0f).max(1.0f); - b.add_input(N_("Outer Mask")).default_value(0.8f).min(0.0f).max(1.0f); - b.add_output(N_("Mask")); + b.add_input("Inner Mask").default_value(0.8f).min(0.0f).max(1.0f); + b.add_input("Outer Mask").default_value(0.8f).min(0.0f).max(1.0f); + b.add_output("Mask"); } static void node_composit_buts_double_edge_mask(uiLayout *layout, diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc index ffe68317954..16485645900 100644 --- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc @@ -27,17 +27,17 @@ NODE_STORAGE_FUNCS(NodeEllipseMask) static void cmp_node_ellipsemask_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mask")) + b.add_input("Mask") .default_value(0.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_input(N_("Value")) + b.add_input("Value") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(1); - b.add_output(N_("Mask")); + b.add_output("Mask"); } static void node_composit_init_ellipsemask(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc index 81d767db08e..f4d33c00628 100644 --- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc +++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc @@ -17,11 +17,11 @@ namespace blender::nodes::node_composite_exposure_cc { static void cmp_node_exposure_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Exposure")).min(-10.0f).max(10.0f).compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_input("Exposure").min(-10.0f).max(10.0f).compositor_domain_priority(1); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.cc b/source/blender/nodes/composite/nodes/node_composite_filter.cc index 03df984ddbd..47020449fa6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_filter.cc +++ b/source/blender/nodes/composite/nodes/node_composite_filter.cc @@ -21,16 +21,16 @@ namespace blender::nodes::node_composite_filter_cc { static void cmp_node_filter_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_buts_filter(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc index 5ed3891718a..1b5e3d54fa9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_flip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc @@ -25,10 +25,10 @@ namespace blender::nodes::node_composite_flip_cc { static void cmp_node_flip_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_buts_flip(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.cc b/source/blender/nodes/composite/nodes/node_composite_gamma.cc index 322e5973659..915f7a6d4cc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_gamma.cc +++ b/source/blender/nodes/composite/nodes/node_composite_gamma.cc @@ -17,16 +17,16 @@ namespace blender::nodes::node_composite_gamma_cc { static void cmp_node_gamma_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Gamma")) + b.add_input("Gamma") .default_value(1.0f) .min(0.001f) .max(10.0f) .subtype(PROP_UNSIGNED) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.cc b/source/blender/nodes/composite/nodes/node_composite_glare.cc index e0c6213fe32..175ee323edf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_glare.cc +++ b/source/blender/nodes/composite/nodes/node_composite_glare.cc @@ -42,10 +42,10 @@ NODE_STORAGE_FUNCS(NodeGlare) static void cmp_node_glare_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_glare(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc b/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc index 4e24893870d..faac4215d01 100644 --- a/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc +++ b/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc @@ -17,35 +17,35 @@ namespace blender::nodes::node_composite_hue_sat_val_cc { static void cmp_node_huesatval_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Hue")) + b.add_input("Hue") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Saturation")) + b.add_input("Saturation") .default_value(1.0f) .min(0.0f) .max(2.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(2); - b.add_input(CTX_N_(BLT_I18NCONTEXT_COLOR, "Value")) + b.add_input("Value") .translation_context(BLT_I18NCONTEXT_COLOR) .default_value(1.0f) .min(0.0f) .max(2.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(3); - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(4); - b.add_output(N_("Image")); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc index c00c662006e..4ec9863cdcf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc +++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc @@ -19,16 +19,16 @@ namespace blender::nodes::node_composite_huecorrect_cc { static void cmp_node_huecorrect_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_huecorrect(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc index 1cf97682b2f..930c6e10d64 100644 --- a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc @@ -26,12 +26,12 @@ namespace blender::nodes::node_composite_id_mask_cc { static void cmp_node_idmask_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("ID value")) + b.add_input("ID value") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_output(N_("Alpha")); + b.add_output("Alpha"); } static void node_composit_buts_id_mask(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc index 788d0f35d4c..5b5c349b976 100644 --- a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc +++ b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc @@ -20,8 +20,8 @@ namespace blender::nodes::node_composite_inpaint_cc { static void cmp_node_inpaint_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output(N_("Image")); + b.add_input("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output("Image"); } static void node_composit_buts_inpaint(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc index 76cfbbc9ecd..f4dc74898e0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_invert.cc +++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc @@ -20,16 +20,16 @@ namespace blender::nodes::node_composite_invert_cc { static void cmp_node_invert_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Color")) + b.add_input("Color") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Color")); + b.add_output("Color"); } static void node_composit_init_invert(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.cc b/source/blender/nodes/composite/nodes/node_composite_keying.cc index fa568ac4ca6..b79962ebd40 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keying.cc @@ -24,13 +24,13 @@ namespace blender::nodes::node_composite_keying_cc { static void cmp_node_keying_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Key Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Garbage Matte")).hide_value(); - b.add_input(N_("Core Matte")).hide_value(); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); - b.add_output(N_("Edges")); + b.add_input("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Key Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Garbage Matte").hide_value(); + b.add_input("Core Matte").hide_value(); + b.add_output("Image"); + b.add_output("Matte"); + b.add_output("Edges"); } static void node_composit_init_keying(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc index 20162c57fd0..b2ec9452754 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc @@ -33,8 +33,7 @@ namespace blender::nodes::node_composite_keyingscreen_cc { static void cmp_node_keyingscreen_declare(NodeDeclarationBuilder &b) { - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_SCREEN, "Screen")) - .translation_context(BLT_I18NCONTEXT_ID_SCREEN); + b.add_output("Screen").translation_context(BLT_I18NCONTEXT_ID_SCREEN); } static void node_composit_init_keyingscreen(const bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc index b3334c6f689..2b37f25eded 100644 --- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc +++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc @@ -36,20 +36,20 @@ NODE_STORAGE_FUNCS(NodeLensDist) static void cmp_node_lensdist_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Distort")) + b.add_input("Distort") .default_value(0.0f) .min(MINIMUM_DISTORTION) .max(1.0f) .compositor_expects_single_value(); - b.add_input(N_("Dispersion")) + b.add_input("Dispersion") .default_value(0.0f) .min(0.0f) .max(1.0f) .compositor_expects_single_value(); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_lensdist(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc index b9613d48602..8da9e0a30f9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_levels.cc +++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc @@ -27,11 +27,11 @@ namespace blender::nodes::node_composite_levels_cc { static void cmp_node_levels_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({0.0f, 0.0f, 0.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Mean")); - b.add_output(N_("Std Dev")); + b.add_output("Mean"); + b.add_output("Std Dev"); } static void node_composit_init_view_levels(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc index e6056e0e1ef..bad4d49cdf4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc @@ -24,11 +24,11 @@ NODE_STORAGE_FUNCS(NodeChroma) static void cmp_node_luma_matte_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); - b.add_output(N_("Matte")); + b.add_output("Image"); + b.add_output("Matte"); } static void node_composit_init_luma_matte(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_map_range.cc b/source/blender/nodes/composite/nodes/node_composite_map_range.cc index bce5e873115..82acb287294 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc @@ -20,32 +20,32 @@ namespace blender::nodes::node_composite_map_range_cc { static void cmp_node_map_range_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value")) + b.add_input("Value") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_input(N_("From Min")) + b.add_input("From Min") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(1); - b.add_input(N_("From Max")) + b.add_input("From Max") .default_value(1.0f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(2); - b.add_input(N_("To Min")) + b.add_input("To Min") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(3); - b.add_input(N_("To Max")) + b.add_input("To Max") .default_value(1.0f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(4); - b.add_output(N_("Value")); + b.add_output("Value"); } static void node_composit_buts_map_range(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc index 4779f8c99dc..1c10558ed85 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc @@ -24,15 +24,15 @@ namespace blender::nodes::node_composite_map_uv_cc { static void cmp_node_map_uv_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_skip_realization(); - b.add_input(N_("UV")) + b.add_input("UV") .default_value({1.0f, 0.0f, 0.0f}) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_buts_map_uv(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_map_value.cc b/source/blender/nodes/composite/nodes/node_composite_map_value.cc index 8fe3119a053..363110be4a8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc @@ -26,12 +26,12 @@ NODE_STORAGE_FUNCS(TexMapping) static void cmp_node_map_value_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value")) + b.add_input("Value") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_output(N_("Value")); + b.add_output("Value"); } static void node_composit_init_map_value(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc index 82c50dc59f8..c9d631bdd58 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc @@ -28,7 +28,7 @@ NODE_STORAGE_FUNCS(NodeMask) static void cmp_node_mask_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Mask")); + b.add_output("Mask"); } static void node_composit_init_mask(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_math.cc b/source/blender/nodes/composite/nodes/node_composite_math.cc index ce1a17df607..01a260ea2a9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_math.cc +++ b/source/blender/nodes/composite/nodes/node_composite_math.cc @@ -19,22 +19,22 @@ namespace blender::nodes::node_composite_math_cc { static void cmp_node_math_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value")) + b.add_input("Value") .default_value(0.5f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(0); - b.add_input(N_("Value"), "Value_001") + b.add_input("Value", "Value_001") .default_value(0.5f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(1); - b.add_input(N_("Value"), "Value_002") + b.add_input("Value", "Value_002") .default_value(0.5f) .min(-10000.0f) .max(10000.0f) .compositor_domain_priority(2); - b.add_output(N_("Value")); + b.add_output("Value"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc index 5099ebec396..b2ff54b9eee 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc @@ -21,19 +21,19 @@ namespace blender::nodes::node_composite_mixrgb_cc { static void cmp_node_mixrgb_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(2); - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Image"), "Image_001") + b.add_input("Image", "Image_001") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc index 5dac7b0b586..78fbcfbc2b1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc @@ -31,12 +31,12 @@ namespace blender::nodes::node_composite_movieclip_cc { static void cmp_node_movieclip_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Image")); - b.add_output(N_("Alpha")); - b.add_output(N_("Offset X")); - b.add_output(N_("Offset Y")); - b.add_output(N_("Scale")); - b.add_output(N_("Angle")); + b.add_output("Image"); + b.add_output("Alpha"); + b.add_output("Offset X"); + b.add_output("Offset Y"); + b.add_output("Scale"); + b.add_output("Angle"); } static void init(const bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc index 8ccaaf455b7..1058ad94586 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc @@ -26,8 +26,8 @@ namespace blender::nodes::node_composite_moviedistortion_cc { static void cmp_node_moviedistortion_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output(N_("Image")); + b.add_input("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output("Image"); } static void label(const bNodeTree * /*ntree*/, const bNode *node, char *label, int label_maxncpy) diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.cc b/source/blender/nodes/composite/nodes/node_composite_normal.cc index 645828fd37e..eade93852c2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_normal.cc +++ b/source/blender/nodes/composite/nodes/node_composite_normal.cc @@ -17,18 +17,18 @@ namespace blender::nodes::node_composite_normal_cc { static void cmp_node_normal_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Normal")) + b.add_input("Normal") .default_value({0.0f, 0.0f, 1.0f}) .min(-1.0f) .max(1.0f) .subtype(PROP_DIRECTION) .compositor_domain_priority(0); - b.add_output(N_("Normal")) + b.add_output("Normal") .default_value({0.0f, 0.0f, 1.0f}) .min(-1.0f) .max(1.0f) .subtype(PROP_DIRECTION); - b.add_output(N_("Dot")); + b.add_output("Dot"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_normalize.cc b/source/blender/nodes/composite/nodes/node_composite_normalize.cc index 04d16de3020..b6f6712c37a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_normalize.cc +++ b/source/blender/nodes/composite/nodes/node_composite_normalize.cc @@ -17,12 +17,12 @@ namespace blender::nodes::node_composite_normalize_cc { static void cmp_node_normalize_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value")) + b.add_input("Value") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(0); - b.add_output(N_("Value")); + b.add_output("Value"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc index 05b11f1eb3d..4a44e1d6d9f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc @@ -17,8 +17,8 @@ namespace blender::nodes::node_composite_pixelate_cc { static void cmp_node_pixelate_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")); - b.add_output(N_("Color")); + b.add_input("Color"); + b.add_output("Color"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc index 90ef8abb76f..a819e46e56c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc @@ -41,9 +41,9 @@ NODE_STORAGE_FUNCS(NodePlaneTrackDeformData) static void cmp_node_planetrackdeform_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).compositor_skip_realization(); - b.add_output(N_("Image")); - b.add_output(N_("Plane")); + b.add_input("Image").compositor_skip_realization(); + b.add_output("Image"); + b.add_output("Plane"); } static void init(const bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_posterize.cc b/source/blender/nodes/composite/nodes/node_composite_posterize.cc index 5fbf39bff2e..903547be4fe 100644 --- a/source/blender/nodes/composite/nodes/node_composite_posterize.cc +++ b/source/blender/nodes/composite/nodes/node_composite_posterize.cc @@ -17,15 +17,15 @@ namespace blender::nodes::node_composite_posterize_cc { static void cmp_node_posterize_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Steps")) + b.add_input("Steps") .default_value(8.0f) .min(2.0f) .max(1024.0f) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc index c36fbc63637..5faac36ac9c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc +++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc @@ -20,10 +20,10 @@ namespace blender::nodes::node_composite_premulkey_cc { static void cmp_node_premulkey_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_buts_premulkey(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_rgb.cc index 1fc646b480a..7edfd2f6879 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rgb.cc @@ -19,7 +19,7 @@ namespace blender::nodes::node_composite_rgb_cc { static void cmp_node_rgb_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("RGBA")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output("RGBA").default_value({0.5f, 0.5f, 0.5f, 1.0f}); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.cc b/source/blender/nodes/composite/nodes/node_composite_rotate.cc index 851fd1ecce4..1bb3488a3f8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rotate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rotate.cc @@ -21,16 +21,16 @@ namespace blender::nodes::node_composite_rotate_cc { static void cmp_node_rotate_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Degr")) + b.add_input("Degr") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .subtype(PROP_ANGLE) .compositor_expects_single_value(); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_rotate(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.cc b/source/blender/nodes/composite/nodes/node_composite_scale.cc index 22d8d76fb9f..99156bc4643 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scale.cc +++ b/source/blender/nodes/composite/nodes/node_composite_scale.cc @@ -25,20 +25,20 @@ namespace blender::nodes::node_composite_scale_cc { static void cmp_node_scale_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("X")) + b.add_input("X") .default_value(1.0f) .min(0.0001f) .max(CMP_SCALE_MAX) .compositor_expects_single_value(); - b.add_input(N_("Y")) + b.add_input("Y") .default_value(1.0f) .min(0.0001f) .max(CMP_SCALE_MAX) .compositor_expects_single_value(); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composite_update_scale(bNodeTree *ntree, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc index 3a7e7dc78bd..10564164e34 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc +++ b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc @@ -11,8 +11,8 @@ namespace blender::nodes { static void cmp_node_scene_time_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Seconds")); - b.add_output(N_("Frame")); + b.add_output("Seconds"); + b.add_output("Frame"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc index 118ab6ccdf8..20a28b590d4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc @@ -66,13 +66,13 @@ NODE_STORAGE_FUNCS(NodeCMPCombSepColor) static void cmp_node_separate_color_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Red")); - b.add_output(N_("Green")); - b.add_output(N_("Blue")); - b.add_output(N_("Alpha")); + b.add_output("Red"); + b.add_output("Green"); + b.add_output("Blue"); + b.add_output("Alpha"); } static void cmp_node_separate_color_update(bNodeTree * /*ntree*/, bNode *node) @@ -154,31 +154,31 @@ NODE_STORAGE_FUNCS(NodeCMPCombSepColor) static void cmp_node_combine_color_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Red")) + b.add_input("Red") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(0); - b.add_input(N_("Green")) + b.add_input("Green") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_input(N_("Blue")) + b.add_input("Blue") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(2); - b.add_input(N_("Alpha")) + b.add_input("Alpha") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(3); - b.add_output(N_("Image")); + b.add_output("Image"); } static void cmp_node_combine_color_update(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc index f62ed6f1a0e..e8adf78adcd 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc @@ -17,13 +17,13 @@ namespace blender::nodes::node_composite_separate_hsva_cc { static void cmp_node_sephsva_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("H")); - b.add_output(N_("S")); - b.add_output(N_("V")); - b.add_output(N_("A")); + b.add_output("H"); + b.add_output("S"); + b.add_output("V"); + b.add_output("A"); } using namespace blender::realtime_compositor; @@ -70,15 +70,12 @@ namespace blender::nodes::node_composite_combine_hsva_cc { static void cmp_node_combhsva_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("H")).min(0.0f).max(1.0f).compositor_domain_priority(0); - b.add_input(N_("S")).min(0.0f).max(1.0f).compositor_domain_priority(1); - b.add_input(N_("V")).min(0.0f).max(1.0f).compositor_domain_priority(2); - b.add_input(N_("A")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .compositor_domain_priority(3); - b.add_output(N_("Image")); + b.add_input("H").min(0.0f).max(1.0f).compositor_domain_priority(0); + b.add_input("S").min(0.0f).max(1.0f).compositor_domain_priority(1); + b.add_input("V").min(0.0f).max(1.0f).compositor_domain_priority(2); + b.add_input("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority( + 3); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc index 577a0f528d0..027a3eb847b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc @@ -17,13 +17,13 @@ namespace blender::nodes::node_composite_separate_rgba_cc { static void cmp_node_seprgba_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("R")); - b.add_output(N_("G")); - b.add_output(N_("B")); - b.add_output(N_("A")); + b.add_output("R"); + b.add_output("G"); + b.add_output("B"); + b.add_output("A"); } using namespace blender::realtime_compositor; @@ -70,15 +70,12 @@ namespace blender::nodes::node_composite_combine_rgba_cc { static void cmp_node_combrgba_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("R")).min(0.0f).max(1.0f).compositor_domain_priority(0); - b.add_input(N_("G")).min(0.0f).max(1.0f).compositor_domain_priority(1); - b.add_input(N_("B")).min(0.0f).max(1.0f).compositor_domain_priority(2); - b.add_input(N_("A")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .compositor_domain_priority(3); - b.add_output(N_("Image")); + b.add_input("R").min(0.0f).max(1.0f).compositor_domain_priority(0); + b.add_input("G").min(0.0f).max(1.0f).compositor_domain_priority(1); + b.add_input("B").min(0.0f).max(1.0f).compositor_domain_priority(2); + b.add_input("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority( + 3); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc index ef0372ad703..0828308d060 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc @@ -19,13 +19,13 @@ namespace blender::nodes::node_composite_separate_ycca_cc { static void cmp_node_sepycca_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Y")); - b.add_output(N_("Cb")); - b.add_output(N_("Cr")); - b.add_output(N_("A")); + b.add_output("Y"); + b.add_output("Cb"); + b.add_output("Cr"); + b.add_output("A"); } static void node_composit_init_mode_sepycca(bNodeTree * /*ntree*/, bNode *node) @@ -98,23 +98,20 @@ namespace blender::nodes::node_composite_combine_ycca_cc { static void cmp_node_combycca_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Y")).min(0.0f).max(1.0f).compositor_domain_priority(0); - b.add_input(N_("Cb")) + b.add_input("Y").min(0.0f).max(1.0f).compositor_domain_priority(0); + b.add_input("Cb") .default_value(0.5f) .min(0.0f) .max(1.0f) .compositor_domain_priority(1); - b.add_input(N_("Cr")) + b.add_input("Cr") .default_value(0.5f) .min(0.0f) .max(1.0f) .compositor_domain_priority(2); - b.add_input(N_("A")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .compositor_domain_priority(3); - b.add_output(N_("Image")); + b.add_input("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority( + 3); + b.add_output("Image"); } static void node_composit_init_mode_combycca(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc index 190f6cbf7ee..db447d63628 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc @@ -17,13 +17,13 @@ namespace blender::nodes::node_composite_separate_yuva_cc { static void cmp_node_sepyuva_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Y")); - b.add_output(N_("U")); - b.add_output(N_("V")); - b.add_output(N_("A")); + b.add_output("Y"); + b.add_output("U"); + b.add_output("V"); + b.add_output("A"); } using namespace blender::realtime_compositor; @@ -70,15 +70,12 @@ namespace blender::nodes::node_composite_combine_yuva_cc { static void cmp_node_combyuva_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Y")).min(0.0f).max(1.0f).compositor_domain_priority(0); - b.add_input(N_("U")).min(0.0f).max(1.0f).compositor_domain_priority(1); - b.add_input(N_("V")).min(0.0f).max(1.0f).compositor_domain_priority(2); - b.add_input(N_("A")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .compositor_domain_priority(3); - b.add_output(N_("Image")); + b.add_input("Y").min(0.0f).max(1.0f).compositor_domain_priority(0); + b.add_input("U").min(0.0f).max(1.0f).compositor_domain_priority(1); + b.add_input("V").min(0.0f).max(1.0f).compositor_domain_priority(2); + b.add_input("A").default_value(1.0f).min(0.0f).max(1.0f).compositor_domain_priority( + 3); + b.add_output("Image"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index 98769a07706..5c6de1b96e1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -22,15 +22,15 @@ NODE_STORAGE_FUNCS(NodeSetAlpha) static void cmp_node_setalpha_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Alpha")) + b.add_input("Alpha") .default_value(1.0f) .min(0.0f) .max(1.0f) .compositor_domain_priority(1); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_setalpha(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc index 43c9e424cea..cf7a31ea71a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc @@ -25,8 +25,8 @@ namespace blender::nodes::node_composite_split_viewer_cc { static void cmp_node_split_viewer_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")); - b.add_input(N_("Image"), "Image_001"); + b.add_input("Image"); + b.add_input("Image", "Image_001"); } static void node_composit_init_splitviewer(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc index 2ddebf8a14e..a86576b1ffb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc +++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc @@ -34,10 +34,10 @@ namespace blender::nodes::node_composite_stabilize2d_cc { static void cmp_node_stabilize2d_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void init(const bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc index 1709dc33970..2c217743761 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc @@ -18,8 +18,8 @@ namespace blender::nodes::node_composite_sunbeams_cc { static void cmp_node_sunbeams_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output(N_("Image")); + b.add_input("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output("Image"); } static void init(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.cc b/source/blender/nodes/composite/nodes/node_composite_switch.cc index bde8429180b..ef857edff49 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switch.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switch.cc @@ -18,9 +18,9 @@ namespace blender::nodes::node_composite_switch_cc { static void cmp_node_switch_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Off")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("On")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output(N_("Image")); + b.add_input("Off").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("On").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output("Image"); } static void node_composit_buts_switch(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.cc b/source/blender/nodes/composite/nodes/node_composite_texture.cc index 32057b235c7..abfc0459956 100644 --- a/source/blender/nodes/composite/nodes/node_composite_texture.cc +++ b/source/blender/nodes/composite/nodes/node_composite_texture.cc @@ -19,19 +19,19 @@ namespace blender::nodes::node_composite_texture_cc { static void cmp_node_texture_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Offset")) + b.add_input("Offset") .min(-2.0f) .max(2.0f) .subtype(PROP_TRANSLATION) .compositor_expects_single_value(); - b.add_input(N_("Scale")) + b.add_input("Scale") .default_value({1.0f, 1.0f, 1.0f}) .min(-10.0f) .max(10.0f) .subtype(PROP_XYZ) .compositor_expects_single_value(); - b.add_output(N_("Value")); - b.add_output(N_("Color")); + b.add_output("Value"); + b.add_output("Color"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc index 188154cc242..ec839e823b2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc +++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc @@ -31,10 +31,10 @@ NODE_STORAGE_FUNCS(NodeTonemap) static void cmp_node_tonemap_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_tonemap(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc index 9cc6cf9d493..bacda078fe1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc +++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc @@ -33,9 +33,9 @@ NODE_STORAGE_FUNCS(NodeTrackPosData) static void cmp_node_trackpos_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("X")); - b.add_output(N_("Y")); - b.add_output(N_("Speed")).subtype(PROP_VELOCITY); + b.add_output("X"); + b.add_output("Y"); + b.add_output("Speed").subtype(PROP_VELOCITY); } static void init(const bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.cc b/source/blender/nodes/composite/nodes/node_composite_transform.cc index 80f289ca5ab..8f27d3f4619 100644 --- a/source/blender/nodes/composite/nodes/node_composite_transform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_transform.cc @@ -22,31 +22,31 @@ namespace blender::nodes::node_composite_transform_cc { static void cmp_node_transform_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("X")) + b.add_input("X") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .compositor_expects_single_value(); - b.add_input(N_("Y")) + b.add_input("Y") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .compositor_expects_single_value(); - b.add_input(N_("Angle")) + b.add_input("Angle") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .subtype(PROP_ANGLE) .compositor_expects_single_value(); - b.add_input(N_("Scale")) + b.add_input("Scale") .default_value(1.0f) .min(0.0001f) .max(CMP_SCALE_MAX) .compositor_expects_single_value(); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_buts_transform(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.cc b/source/blender/nodes/composite/nodes/node_composite_translate.cc index c075891f799..49bf1cb1e70 100644 --- a/source/blender/nodes/composite/nodes/node_composite_translate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_translate.cc @@ -22,20 +22,20 @@ NODE_STORAGE_FUNCS(NodeTranslateData) static void cmp_node_translate_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("X")) + b.add_input("X") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .compositor_expects_single_value(); - b.add_input(N_("Y")) + b.add_input("Y") .default_value(0.0f) .min(-10000.0f) .max(10000.0f) .compositor_expects_single_value(); - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_composit_init_translate(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc index 8379fd27193..5e0bd2efce9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc @@ -25,14 +25,14 @@ namespace blender::nodes::node_composite_color_ramp_cc { static void cmp_node_valtorgb_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")) + b.add_input("Fac") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .compositor_domain_priority(1); - b.add_output(N_("Image")).compositor_domain_priority(0); - b.add_output(N_("Alpha")); + b.add_output("Image").compositor_domain_priority(0); + b.add_output("Alpha"); } static void node_composit_init_valtorgb(bNodeTree * /*ntree*/, bNode *node) @@ -151,10 +151,10 @@ namespace blender::nodes::node_composite_rgb_to_bw_cc { static void cmp_node_rgbtobw_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .compositor_domain_priority(0); - b.add_output(N_("Val")); + b.add_output("Val"); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_value.cc b/source/blender/nodes/composite/nodes/node_composite_value.cc index 462406a3462..ab13cd3dcf5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_value.cc @@ -15,7 +15,7 @@ namespace blender::nodes::node_composite_value_cc { static void cmp_node_value_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Value")).default_value(0.5f); + b.add_output("Value").default_value(0.5f); } using namespace blender::realtime_compositor; diff --git a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc index 9af1bd51c6a..306149fd3ca 100644 --- a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc @@ -20,14 +20,14 @@ namespace blender::nodes::node_composite_vec_blur_cc { static void cmp_node_vec_blur_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Z")).default_value(0.0f).min(0.0f).max(1.0f); - b.add_input(N_("Speed")) + b.add_input("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Z").default_value(0.0f).min(0.0f).max(1.0f); + b.add_input("Speed") .default_value({0.0f, 0.0f, 0.0f}) .min(0.0f) .max(1.0f) .subtype(PROP_VELOCITY); - b.add_output(N_("Image")); + b.add_output("Image"); } /* custom1: iterations, custom2: max_speed (0 = no_limit). */ diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index b4a54eb0930..91b2b71b1f5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -30,9 +30,9 @@ namespace blender::nodes::node_composite_viewer_cc { static void cmp_node_viewer_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("Alpha")).default_value(1.0f).min(0.0f).max(1.0f); - b.add_input(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f); + b.add_input("Image").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("Alpha").default_value(1.0f).min(0.0f).max(1.0f); + b.add_input("Z").default_value(1.0f).min(0.0f).max(1.0f); } static void node_composit_init_viewer(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc index f3205f96a90..29e6ff52277 100644 --- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc +++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc @@ -28,24 +28,24 @@ namespace blender::nodes::node_composite_zcombine_cc { static void cmp_node_zcombine_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")) + b.add_input("Image") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(0); - b.add_input(N_("Z")) + b.add_input("Z") .default_value(1.0f) .min(0.0f) .max(10000.0f) .compositor_domain_priority(2); - b.add_input(N_("Image"), "Image_001") + b.add_input("Image", "Image_001") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) .compositor_domain_priority(1); - b.add_input(N_("Z"), "Z_001") + b.add_input("Z", "Z_001") .default_value(1.0f) .min(0.0f) .max(10000.0f) .compositor_domain_priority(3); - b.add_output(N_("Image")); - b.add_output(N_("Z")); + b.add_output("Image"); + b.add_output("Z"); } static void node_composit_buts_zcombine(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 f8a1cd3cf1d..920931c85dc 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 @@ -15,14 +15,10 @@ namespace blender::nodes::node_fn_align_euler_to_vector_cc { static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Rotation")).subtype(PROP_EULER).hide_value(); - b.add_input(N_("Factor")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Vector")).default_value({0.0, 0.0, 1.0}); - b.add_output(N_("Rotation")).subtype(PROP_EULER); + b.add_input("Rotation").subtype(PROP_EULER).hide_value(); + b.add_input("Factor").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Vector").default_value({0.0, 0.0, 1.0}); + b.add_output("Rotation").subtype(PROP_EULER); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 3c9fa268e2d..eefac0dc32e 100644 --- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc +++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc @@ -18,9 +18,9 @@ namespace blender::nodes::node_fn_boolean_math_cc { static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Boolean"), "Boolean"); - b.add_input(N_("Boolean"), "Boolean_001"); - b.add_output(N_("Boolean")); + b.add_input("Boolean", "Boolean"); + b.add_input("Boolean", "Boolean_001"); + b.add_output("Boolean"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_combine_color.cc b/source/blender/nodes/function/nodes/node_fn_combine_color.cc index ec1d03125e2..1a86aaa9b44 100644 --- a/source/blender/nodes/function/nodes/node_fn_combine_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_combine_color.cc @@ -12,23 +12,11 @@ NODE_STORAGE_FUNCS(NodeCombSepColor) static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Red")).default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input(N_("Green")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Blue")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Alpha")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_output(N_("Color")); + b.add_input("Red").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Green").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Blue").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Alpha").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output("Color"); }; static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index 18cc125b5a8..931483657c6 100644 --- a/source/blender/nodes/function/nodes/node_fn_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_compare.cc @@ -23,26 +23,26 @@ NODE_STORAGE_FUNCS(NodeFunctionCompare) static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("A")).min(-10000.0f).max(10000.0f); - b.add_input(N_("B")).min(-10000.0f).max(10000.0f); + b.add_input("A").min(-10000.0f).max(10000.0f); + b.add_input("B").min(-10000.0f).max(10000.0f); - b.add_input(N_("A"), "A_INT"); - b.add_input(N_("B"), "B_INT"); + b.add_input("A", "A_INT"); + b.add_input("B", "B_INT"); - b.add_input(N_("A"), "A_VEC3"); - b.add_input(N_("B"), "B_VEC3"); + b.add_input("A", "A_VEC3"); + b.add_input("B", "B_VEC3"); - b.add_input(N_("A"), "A_COL"); - b.add_input(N_("B"), "B_COL"); + b.add_input("A", "A_COL"); + b.add_input("B", "B_COL"); - b.add_input(N_("A"), "A_STR"); - b.add_input(N_("B"), "B_STR"); + b.add_input("A", "A_STR"); + b.add_input("B", "B_STR"); - b.add_input(N_("C")).default_value(0.9f); - b.add_input(N_("Angle")).default_value(0.0872665f).subtype(PROP_ANGLE); - b.add_input(N_("Epsilon")).default_value(0.001).min(-10000.0f).max(10000.0f); + b.add_input("C").default_value(0.9f); + b.add_input("Angle").default_value(0.0872665f).subtype(PROP_ANGLE); + b.add_input("Epsilon").default_value(0.001).min(-10000.0f).max(10000.0f); - b.add_output(N_("Result")); + b.add_output("Result"); } static void node_layout(uiLayout *layout, bContext * /*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 54c9644feff..65b686c671a 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 @@ -18,8 +18,8 @@ namespace blender::nodes::node_fn_float_to_int_cc { static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Float")); - b.add_output(N_("Integer")); + b.add_input("Float"); + b.add_output("Integer"); } static void node_layout(uiLayout *layout, bContext * /*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 31167ea43fa..597f086dc41 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_bool_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Boolean")); + b.add_output("Boolean"); } static void node_layout(uiLayout *layout, bContext * /*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 30a3bcf29ab..6114601b37b 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_color_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Color")); + b.add_output("Color"); } static void node_layout(uiLayout *layout, bContext * /*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 a42407c620b..6374312af1d 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_int_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Integer")); + b.add_output("Integer"); } static void node_layout(uiLayout *layout, bContext * /*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 1a498fd043c..aa317845e0e 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 @@ -6,9 +6,8 @@ namespace blender::nodes::node_fn_input_special_characters_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Line Break")); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_TEXT, "Tab")) - .translation_context(BLT_I18NCONTEXT_ID_TEXT); + b.add_output("Line Break"); + b.add_output("Tab").translation_context(BLT_I18NCONTEXT_ID_TEXT); } class MF_SpecialCharacters : public mf::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 ea007c21d53..f94f818aec7 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_string.cc @@ -10,7 +10,7 @@ namespace blender::nodes::node_fn_input_string_cc { static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_output(N_("String")); + b.add_output("String"); } static void node_layout(uiLayout *layout, bContext * /*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 084eb3372d5..73e7e85aad2 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_vector.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_fn_input_vector_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Vector")); + b.add_output("Vector"); } static void node_layout(uiLayout *layout, bContext * /*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 c7fc567dd8a..519d9d1df3f 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_value.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_value.cc @@ -16,30 +16,30 @@ NODE_STORAGE_FUNCS(NodeRandomValue) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Min")).supports_field(); - b.add_input(N_("Max")).default_value({1.0f, 1.0f, 1.0f}).supports_field(); - b.add_input(N_("Min"), "Min_001").supports_field(); - b.add_input(N_("Max"), "Max_001").default_value(1.0f).supports_field(); - b.add_input(N_("Min"), "Min_002").min(-100000).max(100000).supports_field(); - b.add_input(N_("Max"), "Max_002") + b.add_input("Min").supports_field(); + b.add_input("Max").default_value({1.0f, 1.0f, 1.0f}).supports_field(); + b.add_input("Min", "Min_001").supports_field(); + b.add_input("Max", "Max_001").default_value(1.0f).supports_field(); + b.add_input("Min", "Min_002").min(-100000).max(100000).supports_field(); + b.add_input("Max", "Max_002") .default_value(100) .min(-100000) .max(100000) .supports_field(); - b.add_input(N_("Probability")) + b.add_input("Probability") .min(0.0f) .max(1.0f) .default_value(0.5f) .subtype(PROP_FACTOR) .supports_field() .make_available([](bNode &node) { node_storage(node).data_type = CD_PROP_BOOL; }); - b.add_input(N_("ID")).implicit_field(implicit_field_inputs::id_or_index); - b.add_input(N_("Seed")).default_value(0).min(-10000).max(10000).supports_field(); + b.add_input("ID").implicit_field(implicit_field_inputs::id_or_index); + b.add_input("Seed").default_value(0).min(-10000).max(10000).supports_field(); - b.add_output(N_("Value")).dependent_field(); - b.add_output(N_("Value"), "Value_001").dependent_field(); - b.add_output(N_("Value"), "Value_002").dependent_field(); - b.add_output(N_("Value"), "Value_003").dependent_field(); + b.add_output("Value").dependent_field(); + b.add_output("Value", "Value_001").dependent_field(); + b.add_output("Value", "Value_002").dependent_field(); + b.add_output("Value", "Value_003").dependent_field(); } static void node_layout(uiLayout *layout, bContext * /*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 061380bd1a7..af964b4f96a 100644 --- a/source/blender/nodes/function/nodes/node_fn_replace_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_replace_string.cc @@ -8,11 +8,10 @@ namespace blender::nodes::node_fn_replace_string_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("String")); - b.add_input(N_("Find")).description(N_("The string to find in the input string")); - b.add_input(N_("Replace")) - .description(N_("The string to replace each match with")); - b.add_output(N_("String")); + b.add_input("String"); + b.add_input("Find").description("The string to find in the input string"); + b.add_input("Replace").description("The string to replace each match with"); + b.add_output("String"); } static std::string replace_all(const StringRefNull str, 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 c4cb0b9e904..b8a59870de0 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -20,16 +20,16 @@ static void node_declare(NodeDeclarationBuilder &b) }; b.is_function_node(); - b.add_input(N_("Rotation")).subtype(PROP_EULER).hide_value(); - b.add_input(N_("Rotate By")).subtype(PROP_EULER).make_available([](bNode &node) { + b.add_input("Rotation").subtype(PROP_EULER).hide_value(); + b.add_input("Rotate By").subtype(PROP_EULER).make_available([](bNode &node) { node.custom1 = FN_NODE_ROTATE_EULER_TYPE_EULER; }); - b.add_input(N_("Axis")) + b.add_input("Axis") .default_value({0.0, 0.0, 1.0}) .subtype(PROP_XYZ) .make_available(enable_axis_angle); - b.add_input(N_("Angle")).subtype(PROP_ANGLE).make_available(enable_axis_angle); - b.add_output(N_("Rotation")); + b.add_input("Angle").subtype(PROP_ANGLE).make_available(enable_axis_angle); + b.add_output("Rotation"); } static void node_update(bNodeTree *ntree, bNode *node) diff --git a/source/blender/nodes/function/nodes/node_fn_separate_color.cc b/source/blender/nodes/function/nodes/node_fn_separate_color.cc index 2f29514cd87..526f7bc946b 100644 --- a/source/blender/nodes/function/nodes/node_fn_separate_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_separate_color.cc @@ -12,11 +12,11 @@ NODE_STORAGE_FUNCS(NodeCombSepColor) static void node_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output(N_("Red")); - b.add_output(N_("Green")); - b.add_output(N_("Blue")); - b.add_output(N_("Alpha")); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output("Red"); + b.add_output("Green"); + b.add_output("Blue"); + b.add_output("Alpha"); }; static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 522e5639433..918c45e5c2b 100644 --- a/source/blender/nodes/function/nodes/node_fn_slice_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_slice_string.cc @@ -8,10 +8,10 @@ namespace blender::nodes::node_fn_slice_string_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("String")); - b.add_input(N_("Position")); - b.add_input(N_("Length")).min(0).default_value(10); - b.add_output(N_("String")); + b.add_input("String"); + b.add_input("Position"); + b.add_input("Length").min(0).default_value(10); + b.add_output("String"); } static void node_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 06012be4900..6a8a28d0c76 100644 --- a/source/blender/nodes/function/nodes/node_fn_string_length.cc +++ b/source/blender/nodes/function/nodes/node_fn_string_length.cc @@ -10,8 +10,8 @@ namespace blender::nodes::node_fn_string_length_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("String")); - b.add_output(N_("Length")); + b.add_input("String"); + b.add_output("Length"); } static void node_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 16f5d717644..78747172c61 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 @@ -7,9 +7,9 @@ namespace blender::nodes::node_fn_value_to_string_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value")); - b.add_input(N_("Decimals")).min(0); - b.add_output(N_("String")); + b.add_input("Value"); + b.add_input("Decimals").min(0); + b.add_output("String"); } static void node_build_multi_function(NodeMultiFunctionBuilder &builder) diff --git a/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc b/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc index 1ef31407112..7e74e949182 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc @@ -27,50 +27,49 @@ static void node_declare(NodeDeclarationBuilder &b) std::string total_out_description = N_( "The total of all of the values in the corresponding group"); - b.add_input(N_("Value"), "Value Vector") + b.add_input("Value", "Value Vector") .default_value({1.0f, 1.0f, 1.0f}) .supports_field() .description(value_in_description); - b.add_input(N_("Value"), "Value Float") + b.add_input("Value", "Value Float") .default_value(1.0f) .supports_field() .description(value_in_description); - b.add_input(N_("Value"), "Value Int") + b.add_input("Value", "Value Int") .default_value(1) .supports_field() .description(value_in_description); - b.add_input(N_("Group ID"), "Group Index") + b.add_input("Group ID", "Group Index") .supports_field() - .description( - N_("An index used to group values together for multiple separate accumulations")); + .description("An index used to group values together for multiple separate accumulations"); - b.add_output(N_("Leading"), "Leading Vector") + b.add_output("Leading", "Leading Vector") .field_source_reference_all() .description(leading_out_description); - b.add_output(N_("Leading"), "Leading Float") + b.add_output("Leading", "Leading Float") .field_source_reference_all() .description(leading_out_description); - b.add_output(N_("Leading"), "Leading Int") + b.add_output("Leading", "Leading Int") .field_source_reference_all() .description(leading_out_description); - b.add_output(N_("Trailing"), "Trailing Vector") + b.add_output("Trailing", "Trailing Vector") .field_source_reference_all() .description(trailing_out_description); - b.add_output(N_("Trailing"), "Trailing Float") + b.add_output("Trailing", "Trailing Float") .field_source_reference_all() .description(trailing_out_description); - b.add_output(N_("Trailing"), "Trailing Int") + b.add_output("Trailing", "Trailing Int") .field_source_reference_all() .description(trailing_out_description); - b.add_output(N_("Total"), "Total Vector") + b.add_output("Total", "Total Vector") .field_source_reference_all() .description(total_out_description); - b.add_output(N_("Total"), "Total Float") + b.add_output("Total", "Total Float") .field_source_reference_all() .description(total_out_description); - b.add_output(N_("Total"), "Total Int") + b.add_output("Total", "Total Int") .field_source_reference_all() .description(total_out_description); } 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 ff4e738014d..e9df0e25e29 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc @@ -15,19 +15,19 @@ NODE_STORAGE_FUNCS(NodeGeometryAttributeCapture) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Value")).field_on_all(); - b.add_input(N_("Value"), "Value_001").field_on_all(); - b.add_input(N_("Value"), "Value_002").field_on_all(); - b.add_input(N_("Value"), "Value_003").field_on_all(); - b.add_input(N_("Value"), "Value_004").field_on_all(); + b.add_input("Geometry"); + b.add_input("Value").field_on_all(); + b.add_input("Value", "Value_001").field_on_all(); + b.add_input("Value", "Value_002").field_on_all(); + b.add_input("Value", "Value_003").field_on_all(); + b.add_input("Value", "Value_004").field_on_all(); - b.add_output(N_("Geometry")).propagate_all(); - b.add_output(N_("Attribute")).field_on_all(); - b.add_output(N_("Attribute"), "Attribute_001").field_on_all(); - b.add_output(N_("Attribute"), "Attribute_002").field_on_all(); - b.add_output(N_("Attribute"), "Attribute_003").field_on_all(); - b.add_output(N_("Attribute"), "Attribute_004").field_on_all(); + b.add_output("Geometry").propagate_all(); + b.add_output("Attribute").field_on_all(); + b.add_output("Attribute", "Attribute_001").field_on_all(); + b.add_output("Attribute", "Attribute_002").field_on_all(); + b.add_output("Attribute", "Attribute_003").field_on_all(); + b.add_output("Attribute", "Attribute_004").field_on_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc index 7a621ce9f34..ef5aa8a4c7a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc @@ -12,22 +12,22 @@ namespace blender::nodes::node_geo_attribute_domain_size_cc { static void node_declare(NodeDeclarationBuilder &b) { b.add_input("Geometry"); - b.add_output(N_("Point Count")).make_available([](bNode &node) { + b.add_output("Point Count").make_available([](bNode &node) { node.custom1 = GEO_COMPONENT_TYPE_MESH; }); - b.add_output(N_("Edge Count")).make_available([](bNode &node) { + b.add_output("Edge Count").make_available([](bNode &node) { node.custom1 = GEO_COMPONENT_TYPE_MESH; }); - b.add_output(N_("Face Count")).make_available([](bNode &node) { + b.add_output("Face Count").make_available([](bNode &node) { node.custom1 = GEO_COMPONENT_TYPE_MESH; }); - b.add_output(N_("Face Corner Count")).make_available([](bNode &node) { + b.add_output("Face Corner Count").make_available([](bNode &node) { node.custom1 = GEO_COMPONENT_TYPE_MESH; }); - b.add_output(N_("Spline Count")).make_available([](bNode &node) { + b.add_output("Spline Count").make_available([](bNode &node) { node.custom1 = GEO_COMPONENT_TYPE_CURVE; }); - b.add_output(N_("Instance Count")).make_available([](bNode &node) { + b.add_output("Instance Count").make_available([](bNode &node) { node.custom1 = GEO_COMPONENT_TYPE_INSTANCES; }); } 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 9555abaabe3..f611acc4da4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc @@ -16,28 +16,28 @@ namespace blender::nodes::node_geo_attribute_statistic_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")).default_value(true).field_on_all().hide_value(); - b.add_input(N_("Attribute")).hide_value().field_on_all(); - b.add_input(N_("Attribute"), "Attribute_001").hide_value().field_on_all(); + b.add_input("Geometry"); + b.add_input("Selection").default_value(true).field_on_all().hide_value(); + b.add_input("Attribute").hide_value().field_on_all(); + b.add_input("Attribute", "Attribute_001").hide_value().field_on_all(); - b.add_output(N_("Mean")); - b.add_output(N_("Median")); - b.add_output(N_("Sum")); - b.add_output(N_("Min")); - b.add_output(N_("Max")); - b.add_output(N_("Range")); - b.add_output(N_("Standard Deviation")); - b.add_output(N_("Variance")); + b.add_output("Mean"); + b.add_output("Median"); + b.add_output("Sum"); + b.add_output("Min"); + b.add_output("Max"); + b.add_output("Range"); + b.add_output("Standard Deviation"); + b.add_output("Variance"); - b.add_output(N_("Mean"), "Mean_001"); - b.add_output(N_("Median"), "Median_001"); - b.add_output(N_("Sum"), "Sum_001"); - b.add_output(N_("Min"), "Min_001"); - b.add_output(N_("Max"), "Max_001"); - b.add_output(N_("Range"), "Range_001"); - b.add_output(N_("Standard Deviation"), "Standard Deviation_001"); - b.add_output(N_("Variance"), "Variance_001"); + b.add_output("Mean", "Mean_001"); + b.add_output("Median", "Median_001"); + b.add_output("Sum", "Sum_001"); + b.add_output("Min", "Min_001"); + b.add_output("Max", "Max_001"); + b.add_output("Range", "Range_001"); + b.add_output("Standard Deviation", "Standard Deviation_001"); + b.add_output("Variance", "Variance_001"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc index 29536c8b493..0c64781d539 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc @@ -29,19 +29,19 @@ namespace blender::nodes::node_geo_blur_attribute_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value"), "Value_Float") + b.add_input("Value", "Value_Float") .supports_field() .hide_value() .is_default_link_socket(); - b.add_input(N_("Value"), "Value_Int") + b.add_input("Value", "Value_Int") .supports_field() .hide_value() .is_default_link_socket(); - b.add_input(N_("Value"), "Value_Vector") + b.add_input("Value", "Value_Vector") .supports_field() .hide_value() .is_default_link_socket(); - b.add_input(N_("Value"), "Value_Color") + b.add_input("Value", "Value_Color") .supports_field() .hide_value() .is_default_link_socket(); @@ -49,25 +49,21 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input("Iterations") .default_value(1) .min(0) - .description(N_("How many times to blur the values for all elements")); + .description("How many times to blur the values for all elements"); b.add_input("Weight") .default_value(1.0f) .subtype(PROP_FACTOR) .min(0.0f) .max(1.0f) .supports_field() - .description(N_("Relative mix weight of neighboring elements")); + .description("Relative mix weight of neighboring elements"); - b.add_output(N_("Value"), "Value_Float") - .field_source_reference_all() - .dependent_field(); - b.add_output(N_("Value"), "Value_Int").field_source_reference_all().dependent_field(); - b.add_output(N_("Value"), "Value_Vector") - .field_source_reference_all() - .dependent_field(); - b.add_output(N_("Value"), "Value_Color") + b.add_output("Value", "Value_Float").field_source_reference_all().dependent_field(); + b.add_output("Value", "Value_Int").field_source_reference_all().dependent_field(); + b.add_output("Value", "Value_Vector") .field_source_reference_all() .dependent_field(); + b.add_output("Value", "Value_Color").field_source_reference_all().dependent_field(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc index 34f274d9d7c..6f9842cdb6f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc @@ -14,14 +14,13 @@ namespace blender::nodes::node_geo_boolean_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh 1")) - .only_realized_data() - .supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Mesh 2")).multi_input().supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Self Intersection")); - b.add_input(N_("Hole Tolerant")); - b.add_output(N_("Mesh")).propagate_all(); - b.add_output(N_("Intersecting Edges")).field_on_all(); + b.add_input("Mesh 1").only_realized_data().supported_type( + GEO_COMPONENT_TYPE_MESH); + b.add_input("Mesh 2").multi_input().supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Self Intersection"); + b.add_input("Hole Tolerant"); + b.add_output("Mesh").propagate_all(); + b.add_output("Intersecting Edges").field_on_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) @@ -45,12 +44,12 @@ static void node_update(bNodeTree *ntree, bNode *node) case GEO_NODE_BOOLEAN_UNION: bke::nodeSetSocketAvailability(ntree, geometry_1_socket, false); bke::nodeSetSocketAvailability(ntree, geometry_2_socket, true); - node_sock_label(geometry_2_socket, N_("Mesh")); + node_sock_label(geometry_2_socket, "Mesh"); break; case GEO_NODE_BOOLEAN_DIFFERENCE: bke::nodeSetSocketAvailability(ntree, geometry_1_socket, true); bke::nodeSetSocketAvailability(ntree, geometry_2_socket, true); - node_sock_label(geometry_2_socket, N_("Mesh 2")); + node_sock_label(geometry_2_socket, "Mesh 2"); break; } } 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 75c198f7bdd..f1e39fc1d43 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_bounding_box.cc @@ -8,10 +8,10 @@ namespace blender::nodes::node_geo_bounding_box_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_output(N_("Bounding Box")); - b.add_output(N_("Min")); - b.add_output(N_("Max")); + b.add_input("Geometry"); + b.add_output("Bounding Box"); + b.add_output("Min"); + b.add_output("Max"); } static void node_geo_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 5d6ca673daa..34d8800b643 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc @@ -20,15 +20,15 @@ NODE_STORAGE_FUNCS(NodeGeometryCollectionInfo) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Collection")).hide_label(); - b.add_input(N_("Separate Children")) + b.add_input("Collection").hide_label(); + b.add_input("Separate Children") .description( - N_("Output each child of the collection as a separate instance, sorted alphabetically")); - b.add_input(N_("Reset Children")) + "Output each child of the collection as a separate instance, sorted alphabetically"); + b.add_input("Reset Children") .description( - N_("Reset the transforms of every child instance in the output. Only used when Separate " - "Children is enabled")); - b.add_output(N_("Instances")); + "Reset the transforms of every child instance in the output. Only used when Separate " + "Children is enabled"); + b.add_output("Instances"); } static void node_layout(uiLayout *layout, bContext * /*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 5636a17b82d..0e061873928 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc @@ -18,8 +18,8 @@ namespace blender::nodes::node_geo_convex_hull_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_output(N_("Convex Hull")); + b.add_input("Geometry"); + b.add_output("Convex Hull"); } #ifdef WITH_BULLET 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 96b29fc9bfb..36543c1a15d 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 @@ -13,20 +13,19 @@ namespace blender::nodes::node_geo_curve_endpoint_selection_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Start Size")) + b.add_input("Start Size") .min(0) .default_value(1) .supports_field() - .description(N_("The amount of points to select from the start of each spline")); - b.add_input(N_("End Size")) + .description("The amount of points to select from the start of each spline"); + b.add_input("End Size") .min(0) .default_value(1) .supports_field() - .description(N_("The amount of points to select from the end of each spline")); - b.add_output(N_("Selection")) + .description("The amount of points to select from the end of each spline"); + b.add_output("Selection") .field_source_reference_all() - .description( - N_("The selection from the start and end of the splines based on the input sizes")); + .description("The selection from the start and end of the splines based on the input sizes"); } class EndpointFieldInput final : public bke::CurvesFieldInput { 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 8f563fa52ad..2aa4fce7e82 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -23,8 +23,8 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveFill) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_output(N_("Mesh")); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_output("Mesh"); } static void node_layout(uiLayout *layout, bContext * /*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 752a1ac3474..03c67cac20a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -13,23 +13,18 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveFillet) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Count")) - .default_value(1) - .min(1) - .max(1000) - .field_on_all() - .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_FILLET_POLY; }); - b.add_input(N_("Radius")) + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Count").default_value(1).min(1).max(1000).field_on_all().make_available( + [](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_FILLET_POLY; }); + b.add_input("Radius") .min(0.0f) .max(FLT_MAX) .subtype(PropertySubType::PROP_DISTANCE) .default_value(0.25f) .field_on_all(); - b.add_input(N_("Limit Radius")) - .description( - N_("Limit the maximum value of the radius in order to avoid overlapping fillets")); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Limit Radius") + .description("Limit the maximum value of the radius in order to avoid overlapping fillets"); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*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 e3758766afb..d75ac1ecd5c 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 @@ -13,7 +13,7 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveSelectHandles) static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Selection")).field_source(); + b.add_output("Selection").field_source(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 fcbb80611b3..c757c8a6f0e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_length.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_length.cc @@ -8,8 +8,8 @@ namespace blender::nodes::node_geo_curve_length_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_output(N_("Length")); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_output("Length"); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc index a32b054fcb6..e396d2beb21 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc @@ -24,67 +24,68 @@ static void node_declare(NodeDeclarationBuilder &b) node_storage(node).mode = GEO_NODE_CURVE_PRIMITIVE_ARC_TYPE_RADIUS; }; - b.add_input(N_("Resolution")) + b.add_input("Resolution") .default_value(16) .min(2) .max(256) .subtype(PROP_UNSIGNED) - .description(N_("The number of points on the arc")); - b.add_input(N_("Start")) + .description("The number of points on the arc"); + b.add_input("Start") .default_value({-1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the first control point")) + .description("Position of the first control point") .make_available(enable_points); - b.add_input(N_("Middle")) + b.add_input("Middle") .default_value({0.0f, 2.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the middle control point")) + .description("Position of the middle control point") .make_available(enable_points); - b.add_input(N_("End")) + b.add_input("End") .default_value({1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the last control point")) + .description("Position of the last control point") .make_available(enable_points); - b.add_input(N_("Radius")) + b.add_input("Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Distance of the points from the origin")) + .description("Distance of the points from the origin") .make_available(enable_radius); - b.add_input(N_("Start Angle")) + b.add_input("Start Angle") .default_value(0.0f) .subtype(PROP_ANGLE) - .description(N_("Starting angle of the arc")) + .description("Starting angle of the arc") .make_available(enable_radius); - b.add_input(N_("Sweep Angle")) + b.add_input("Sweep Angle") .default_value(1.75f * M_PI) .min(-2 * M_PI) .max(2 * M_PI) .subtype(PROP_ANGLE) - .description(N_("Length of the arc")) + .description("Length of the arc") .make_available(enable_radius); - b.add_input(N_("Offset Angle")) + b.add_input("Offset Angle") .default_value(0.0f) .subtype(PROP_ANGLE) - .description(N_("Offset angle of the arc")) + .description("Offset angle of the arc") .make_available(enable_points); - b.add_input(N_("Connect Center")) + b.add_input("Connect Center") .default_value(false) - .description(N_("Connect the arc at the center")); - b.add_input(N_("Invert Arc")) + .description("Connect the arc at the center"); + b.add_input("Invert Arc") .default_value(false) - .description(N_("Invert and draw opposite arc")); + .description("Invert and draw opposite arc"); - b.add_output(N_("Curve")); - b.add_output(N_("Center")) - .description(N_("The center of the circle described by the three points")) + b.add_output("Curve"); + b.add_output("Center") + .description("The center of the circle described by the three points") .make_available(enable_points); - b.add_output(N_("Normal")) - .description(N_("The normal direction of the plane described by the three points, pointing " - "towards the positive Z axis")) + b.add_output("Normal") + .description( + "The normal direction of the plane described by the three points, pointing " + "towards the positive Z axis") .make_available(enable_points); - b.add_output(N_("Radius")) - .description(N_("The radius of the circle described by the three points")) + b.add_output("Radius") + .description("The radius of the circle described by the three points") .make_available(enable_points); } 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 b212ef54d15..62cdfa11ad6 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 @@ -13,32 +13,32 @@ NODE_STORAGE_FUNCS(NodeGeometryCurvePrimitiveBezierSegment) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Resolution")) + b.add_input("Resolution") .default_value(16) .min(1) .max(256) .subtype(PROP_UNSIGNED) - .description(N_("The number of evaluated points on the curve")); - b.add_input(N_("Start")) + .description("The number of evaluated points on the curve"); + b.add_input("Start") .default_value({-1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the start control point of the curve")); - b.add_input(N_("Start Handle")) + .description("Position of the start control point of the curve"); + b.add_input("Start Handle") .default_value({-0.5f, 0.5f, 0.0f}) .subtype(PROP_TRANSLATION) .description( - N_("Position of the start handle used to define the shape of the curve. In Offset mode, " - "relative to Start point")); - b.add_input(N_("End Handle")) + "Position of the start handle used to define the shape of the curve. In Offset mode, " + "relative to Start point"); + b.add_input("End Handle") .subtype(PROP_TRANSLATION) .description( - N_("Position of the end handle used to define the shape of the curve. In Offset mode, " - "relative to End point")); - b.add_input(N_("End")) + "Position of the end handle used to define the shape of the curve. In Offset mode, " + "relative to End point"); + b.add_input("End") .default_value({1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the end control point of the curve")); - b.add_output(N_("Curve")); + .description("Position of the end control point of the curve"); + b.add_output("Curve"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 f203946e384..cab3fcb3ea6 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 @@ -20,40 +20,40 @@ static void node_declare(NodeDeclarationBuilder &b) node_storage(node).mode = GEO_NODE_CURVE_PRIMITIVE_CIRCLE_TYPE_RADIUS; }; - b.add_input(N_("Resolution")) + b.add_input("Resolution") .default_value(32) .min(3) .max(512) - .description(N_("Number of points on the circle")); - b.add_input(N_("Point 1")) + .description("Number of points on the circle"); + b.add_input("Point 1") .default_value({-1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) .description( - N_("One of the three points on the circle. The point order determines the circle's " - "direction")) + "One of the three points on the circle. The point order determines the circle's " + "direction") .make_available(endable_points); - b.add_input(N_("Point 2")) + b.add_input("Point 2") .default_value({0.0f, 1.0f, 0.0f}) .subtype(PROP_TRANSLATION) .description( - N_("One of the three points on the circle. The point order determines the circle's " - "direction")) + "One of the three points on the circle. The point order determines the circle's " + "direction") .make_available(endable_points); - b.add_input(N_("Point 3")) + b.add_input("Point 3") .default_value({1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) .description( - N_("One of the three points on the circle. The point order determines the circle's " - "direction")) + "One of the three points on the circle. The point order determines the circle's " + "direction") .make_available(endable_points); - b.add_input(N_("Radius")) + b.add_input("Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Distance of the points from the origin")) + .description("Distance of the points from the origin") .make_available(enable_radius); - b.add_output(N_("Curve")); - b.add_output(N_("Center")).make_available(endable_points); + b.add_output("Curve"); + b.add_output("Center").make_available(endable_points); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 1db32cbca5d..1d19712659b 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 @@ -17,26 +17,26 @@ static void node_declare(NodeDeclarationBuilder &b) node_storage(node).mode = GEO_NODE_CURVE_PRIMITIVE_LINE_MODE_DIRECTION; }; - b.add_input(N_("Start")) + b.add_input("Start") .subtype(PROP_TRANSLATION) - .description(N_("Position of the first control point")); - b.add_input(N_("End")) + .description("Position of the first control point"); + b.add_input("End") .default_value({0.0f, 0.0f, 1.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the second control point")) + .description("Position of the second control point") .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_PRIMITIVE_LINE_MODE_POINTS; }); - b.add_input(N_("Direction")) + b.add_input("Direction") .default_value({0.0f, 0.0f, 1.0f}) - .description(N_("Direction the line is going in. The length of this vector does not matter")) + .description("Direction the line is going in. The length of this vector does not matter") .make_available(enable_direction); - b.add_input(N_("Length")) + b.add_input("Length") .default_value(1.0f) .subtype(PROP_DISTANCE) - .description(N_("Distance between the two points")) + .description("Distance between the two points") .make_available(enable_direction); - b.add_output(N_("Curve")); + b.add_output("Curve"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 8f91ffbc160..af554521868 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 @@ -7,25 +7,25 @@ namespace blender::nodes::node_geo_curve_primitive_quadratic_bezier_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Resolution")) + b.add_input("Resolution") .default_value(16) .min(3) .max(256) .subtype(PROP_UNSIGNED) - .description(N_("The number of edges on the curve")); - b.add_input(N_("Start")) + .description("The number of edges on the curve"); + b.add_input("Start") .default_value({-1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the first control point")); - b.add_input(N_("Middle")) + .description("Position of the first control point"); + b.add_input("Middle") .default_value({0.0f, 2.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the middle control point")); - b.add_input(N_("End")) + .description("Position of the middle control point"); + b.add_input("End") .default_value({1.0f, 0.0f, 0.0f}) .subtype(PROP_TRANSLATION) - .description(N_("Position of the last control point")); - b.add_output(N_("Curve")); + .description("Position of the last control point"); + b.add_output("Curve"); } static Curves *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 04dbaddd632..3a5cb05e6d0 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 @@ -14,58 +14,58 @@ NODE_STORAGE_FUNCS(NodeGeometryCurvePrimitiveQuad) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Width")) + b.add_input("Width") .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The X axis size of the shape")); - b.add_input(N_("Height")) + .description("The X axis size of the shape"); + b.add_input("Height") .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The Y axis size of the shape")); - b.add_input(N_("Bottom Width")) + .description("The Y axis size of the shape"); + b.add_input("Bottom Width") .default_value(4.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The X axis size of the shape")); - b.add_input(N_("Top Width")) + .description("The X axis size of the shape"); + b.add_input("Top Width") .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The X axis size of the shape")); - b.add_input(N_("Offset")) + .description("The X axis size of the shape"); + b.add_input("Offset") .default_value(1.0f) .subtype(PROP_DISTANCE) .description( - N_("For Parallelogram, the relative X difference between the top and bottom edges. For " - "Trapezoid, the amount to move the top edge in the positive X axis")); - b.add_input(N_("Bottom Height")) + "For Parallelogram, the relative X difference between the top and bottom edges. For " + "Trapezoid, the amount to move the top edge in the positive X axis"); + b.add_input("Bottom Height") .default_value(3.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The distance between the bottom point and the X axis")); - b.add_input(N_("Top Height")) + .description("The distance between the bottom point and the X axis"); + b.add_input("Top Height") .default_value(1.0f) .subtype(PROP_DISTANCE) - .description(N_("The distance between the top point and the X axis")); - b.add_input(N_("Point 1")) + .description("The distance between the top point and the X axis"); + b.add_input("Point 1") .default_value({-1.0f, -1.0f, 0.0f}) .subtype(PROP_DISTANCE) - .description(N_("The exact location of the point to use")); - b.add_input(N_("Point 2")) + .description("The exact location of the point to use"); + b.add_input("Point 2") .default_value({1.0f, -1.0f, 0.0f}) .subtype(PROP_DISTANCE) - .description(N_("The exact location of the point to use")); - b.add_input(N_("Point 3")) + .description("The exact location of the point to use"); + b.add_input("Point 3") .default_value({1.0f, 1.0f, 0.0f}) .subtype(PROP_DISTANCE) - .description(N_("The exact location of the point to use")); - b.add_input(N_("Point 4")) + .description("The exact location of the point to use"); + b.add_input("Point 4") .default_value({-1.0f, 1.0f, 0.0f}) .subtype(PROP_DISTANCE) - .description(N_("The exact location of the point to use")); - b.add_output(N_("Curve")); + .description("The exact location of the point to use"); + b.add_output("Curve"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 923a3fc50d1..507c3b6a038 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 @@ -8,31 +8,31 @@ namespace blender::nodes::node_geo_curve_primitive_spiral_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Resolution")) + b.add_input("Resolution") .default_value(32) .min(1) .max(1024) .subtype(PROP_UNSIGNED) - .description(N_("Number of points in one rotation of the spiral")); - b.add_input(N_("Rotations")) + .description("Number of points in one rotation of the spiral"); + b.add_input("Rotations") .default_value(2.0f) .min(0.0f) - .description(N_("Number of times the spiral makes a full rotation")); - b.add_input(N_("Start Radius")) + .description("Number of times the spiral makes a full rotation"); + b.add_input("Start Radius") .default_value(1.0f) .subtype(PROP_DISTANCE) - .description(N_("Horizontal Distance from the Z axis at the start of the spiral")); - b.add_input(N_("End Radius")) + .description("Horizontal Distance from the Z axis at the start of the spiral"); + b.add_input("End Radius") .default_value(2.0f) .subtype(PROP_DISTANCE) - .description(N_("Horizontal Distance from the Z axis at the end of the spiral")); - b.add_input(N_("Height")) + .description("Horizontal Distance from the Z axis at the end of the spiral"); + b.add_input("Height") .default_value(2.0f) .subtype(PROP_DISTANCE) - .description(N_("The height perpendicular to the base of the spiral")); - b.add_input(N_("Reverse")) - .description(N_("Switch the direction from clockwise to counterclockwise")); - b.add_output(N_("Curve")); + .description("The height perpendicular to the base of the spiral"); + b.add_input("Reverse").description( + "Switch the direction from clockwise to counterclockwise"); + b.add_output("Curve"); } static Curves *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 d7224b8394d..c9e5ea4cdb6 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 @@ -8,29 +8,29 @@ namespace blender::nodes::node_geo_curve_primitive_star_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Points")) + b.add_input("Points") .default_value(8) .min(3) .max(256) .subtype(PROP_UNSIGNED) - .description(N_("Number of points on each of the circles")); - b.add_input(N_("Inner Radius")) + .description("Number of points on each of the circles"); + b.add_input("Inner Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Radius of the inner circle; can be larger than outer radius")); - b.add_input(N_("Outer Radius")) + .description("Radius of the inner circle; can be larger than outer radius"); + b.add_input("Outer Radius") .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Radius of the outer circle; can be smaller than inner radius")); - b.add_input(N_("Twist")) + .description("Radius of the outer circle; can be smaller than inner radius"); + b.add_input("Twist") .subtype(PROP_ANGLE) - .description(N_("The counterclockwise rotation of the inner set of points")); - b.add_output(N_("Curve")); - b.add_output(N_("Outer Points")) + .description("The counterclockwise rotation of the inner set of points"); + b.add_output("Curve"); + b.add_output("Outer Points") .field_on_all() - .description(N_("An attribute field with a selection of the outer points")); + .description("An attribute field with a selection of the outer points"); } static Curves *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 49b6cb2a81a..e7f95c08099 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc @@ -15,15 +15,12 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveResample) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).field_on_all().hide_value(); - b.add_input(N_("Count")).default_value(10).min(1).max(100000).field_on_all(); - b.add_input(N_("Length")) - .default_value(0.1f) - .min(0.01f) - .field_on_all() - .subtype(PROP_DISTANCE); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).field_on_all().hide_value(); + b.add_input("Count").default_value(10).min(1).max(100000).field_on_all(); + b.add_input("Length").default_value(0.1f).min(0.01f).field_on_all().subtype( + PROP_DISTANCE); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*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 aff41a22426..697cd7b03af 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc @@ -10,9 +10,9 @@ namespace blender::nodes::node_geo_curve_reverse_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Curve").propagate_all(); } static void node_geo_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 1e74bc44387..f1f838e4bf0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc @@ -18,40 +18,39 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveSample) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curves")) - .only_realized_data() - .supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Curves").only_realized_data().supported_type( + GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Value"), "Value_Float").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Int").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Vector").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Color").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Bool").hide_value().field_on_all(); + b.add_input("Value", "Value_Float").hide_value().field_on_all(); + b.add_input("Value", "Value_Int").hide_value().field_on_all(); + b.add_input("Value", "Value_Vector").hide_value().field_on_all(); + b.add_input("Value", "Value_Color").hide_value().field_on_all(); + b.add_input("Value", "Value_Bool").hide_value().field_on_all(); - b.add_input(N_("Factor")) + b.add_input("Factor") .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .field_on_all() .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_SAMPLE_FACTOR; }); - b.add_input(N_("Length")) + b.add_input("Length") .min(0.0f) .subtype(PROP_DISTANCE) .field_on_all() .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_SAMPLE_LENGTH; }); - b.add_input(N_("Curve Index")).field_on_all().make_available([](bNode &node) { + b.add_input("Curve Index").field_on_all().make_available([](bNode &node) { node_storage(node).use_all_curves = false; }); - b.add_output(N_("Value"), "Value_Float").dependent_field({6, 7, 8}); - b.add_output(N_("Value"), "Value_Int").dependent_field({6, 7, 8}); - b.add_output(N_("Value"), "Value_Vector").dependent_field({6, 7, 8}); - b.add_output(N_("Value"), "Value_Color").dependent_field({6, 7, 8}); - b.add_output(N_("Value"), "Value_Bool").dependent_field({6, 7, 8}); + b.add_output("Value", "Value_Float").dependent_field({6, 7, 8}); + b.add_output("Value", "Value_Int").dependent_field({6, 7, 8}); + b.add_output("Value", "Value_Vector").dependent_field({6, 7, 8}); + b.add_output("Value", "Value_Color").dependent_field({6, 7, 8}); + b.add_output("Value", "Value_Bool").dependent_field({6, 7, 8}); - b.add_output(N_("Position")).dependent_field({6, 7, 8}); - b.add_output(N_("Tangent")).dependent_field({6, 7, 8}); - b.add_output(N_("Normal")).dependent_field({6, 7, 8}); + b.add_output("Position").dependent_field({6, 7, 8}); + b.add_output("Tangent").dependent_field({6, 7, 8}); + b.add_output("Normal").dependent_field({6, 7, 8}); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc index e1e9d164075..4232cce3e25 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc @@ -15,9 +15,9 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveSetHandles) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc index f69200e0dcd..d3bdf6573fe 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc @@ -10,19 +10,14 @@ namespace blender::nodes::node_geo_curve_spline_parameter_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Factor")) - .field_source() - .description( - N_("For points, the portion of the spline's total length at the control point. For " - "Splines, the factor of that spline within the entire curve")); - b.add_output(N_("Length")) - .field_source() - .description( - N_("For points, the distance along the control point's spline, For splines, the " - "distance along the entire curve")); - b.add_output(N_("Index")) - .field_source() - .description(N_("Each control point's index on its spline")); + b.add_output("Factor").field_source().description( + "For points, the portion of the spline's total length at the control point. For " + "Splines, the factor of that spline within the entire curve"); + b.add_output("Length").field_source().description( + "For points, the distance along the control point's spline, For splines, the " + "distance along the entire curve"); + b.add_output("Index").field_source().description( + "Each control point's index on its spline"); } /** 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 f2ae85df8dd..e105b428c1a 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 @@ -15,9 +15,9 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveSplineType) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 b04dcd62c70..00e3cea8b80 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc @@ -13,15 +13,10 @@ namespace blender::nodes::node_geo_curve_subdivide_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Cuts")) - .default_value(1) - .min(0) - .max(1000) - .field_on_all() - .description( - N_("The number of control points to create on the segment following each point")); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Cuts").default_value(1).min(0).max(1000).field_on_all().description( + "The number of control points to create on the segment following each point"); + b.add_output("Curve").propagate_all(); } static void node_geo_exec(GeoNodeExecParams params) 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 54274f35305..2f02a56fd8a 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 @@ -13,14 +13,14 @@ namespace blender::nodes::node_geo_curve_to_mesh_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Profile Curve")) + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Profile Curve") .only_realized_data() .supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Fill Caps")) + b.add_input("Fill Caps") .description( - N_("If the profile spline is cyclic, fill the ends of the generated mesh with N-gons")); - b.add_output(N_("Mesh")).propagate_all(); + "If the profile spline is cyclic, fill the ends of the generated mesh with N-gons"); + b.add_output("Mesh").propagate_all(); } 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 d038b80befb..2265e6d77b3 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 @@ -22,24 +22,24 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveToPoints) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Count")) + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Count") .default_value(10) .min(2) .field_on_all() .max(100000) .make_available( [](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_RESAMPLE_COUNT; }); - b.add_input(N_("Length")) + b.add_input("Length") .default_value(0.1f) .min(0.001f) .subtype(PROP_DISTANCE) .make_available( [](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_RESAMPLE_LENGTH; }); - b.add_output(N_("Points")).propagate_all(); - b.add_output(N_("Tangent")).field_on_all(); - b.add_output(N_("Normal")).field_on_all(); - b.add_output(N_("Rotation")).field_on_all(); + b.add_output("Points").propagate_all(); + b.add_output("Tangent").field_on_all(); + b.add_output("Normal").field_on_all(); + b.add_output("Rotation").field_on_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_curve_of_point.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_curve_of_point.cc index f9c5d4e14eb..ce9323ddaa0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_curve_of_point.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_curve_of_point.cc @@ -8,15 +8,15 @@ namespace blender::nodes::node_geo_curve_topology_curve_of_point_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Point Index")) + b.add_input("Point Index") .implicit_field(implicit_field_inputs::index) - .description(N_("The control point to retrieve data from")); - b.add_output(N_("Curve Index")) + .description("The control point to retrieve data from"); + b.add_output("Curve Index") .field_source_reference_all() - .description(N_("The curve the control point is part of")); - b.add_output(N_("Index in Curve")) + .description("The curve the control point is part of"); + b.add_output("Index in Curve") .field_source_reference_all() - .description(N_("How far along the control point is along its curve")); + .description("How far along the control point is along its curve"); } class CurveOfPointInput final : public bke::CurvesFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc index 9341590e049..848ca150d82 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc @@ -10,24 +10,20 @@ namespace blender::nodes::node_geo_curve_topology_points_of_curve_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve Index")) + b.add_input("Curve Index") .implicit_field(implicit_field_inputs::index) - .description(N_("The curve to retrieve data from. Defaults to the curve from the context")); - b.add_input(N_("Weights")) - .supports_field() - .hide_value() - .description(N_("Values used to sort the curve's points. Uses indices by default")); - b.add_input(N_("Sort Index")) + .description("The curve to retrieve data from. Defaults to the curve from the context"); + b.add_input("Weights").supports_field().hide_value().description( + "Values used to sort the curve's points. Uses indices by default"); + b.add_input("Sort Index") .min(0) .supports_field() - .description(N_("Which of the sorted points to output")); - b.add_output(N_("Point Index")) + .description("Which of the sorted points to output"); + b.add_output("Point Index") .field_source_reference_all() - .description(N_("A point of the curve, chosen by the sort index")); - b.add_output(N_("Total")) - .field_source() - .reference_pass({0}) - .description(N_("The number of points in the curve")); + .description("A point of the curve, chosen by the sort index"); + b.add_output("Total").field_source().reference_pass({0}).description( + "The number of points in the curve"); } class PointsOfCurveInput final : public bke::CurvesFieldInput { 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 3287bd95a0c..2fa0017bcf8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -18,33 +18,33 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveTrim) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().supports_field(); - b.add_input(N_("Start")) + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().supports_field(); + b.add_input("Start") .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_SAMPLE_FACTOR; }) .field_on_all(); - b.add_input(N_("End")) + b.add_input("End") .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR) .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_SAMPLE_FACTOR; }) .field_on_all(); - b.add_input(N_("Start"), "Start_001") + b.add_input("Start", "Start_001") .min(0.0f) .subtype(PROP_DISTANCE) .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_SAMPLE_LENGTH; }) .field_on_all(); - b.add_input(N_("End"), "End_001") + b.add_input("End", "End_001") .min(0.0f) .default_value(1.0f) .subtype(PROP_DISTANCE) .make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_CURVE_SAMPLE_LENGTH; }) .field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc index e9ab0027eab..b024a27d647 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc @@ -37,8 +37,8 @@ NODE_STORAGE_FUNCS(NodeGeometryCurveTrim) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curves")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_output(N_("Curves")).propagate_all(); + b.add_input("Curves").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_output("Curves").propagate_all(); } static void deform_curves(const CurvesGeometry &curves, 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 9e33a7e3195..d0f6e85aaee 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -1155,13 +1155,13 @@ NODE_STORAGE_FUNCS(NodeGeometryDeleteGeometry) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")) + b.add_input("Geometry"); + b.add_input("Selection") .default_value(true) .hide_value() .field_on_all() - .description(N_("The parts of the geometry to be deleted")); - b.add_output(N_("Geometry")).propagate_all(); + .description("The parts of the geometry to be deleted"); + b.add_output("Geometry").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc index 2a605607db1..1e155671aab 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc @@ -25,30 +25,28 @@ NODE_STORAGE_FUNCS(NodeGeometryDistributePointsInVolume) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) + b.add_input("Volume") .supported_type(GEO_COMPONENT_TYPE_VOLUME) .translation_context(BLT_I18NCONTEXT_ID_ID); - b.add_input(N_("Density")) + b.add_input("Density") .default_value(1.0f) .min(0.0f) .max(100000.0f) .subtype(PROP_NONE) - .description(N_("Number of points to sample per unit volume")); - b.add_input(N_("Seed")) - .min(-10000) - .max(10000) - .description(N_("Seed used by the random number generator to generate random points")); - b.add_input(N_("Spacing")) + .description("Number of points to sample per unit volume"); + b.add_input("Seed").min(-10000).max(10000).description( + "Seed used by the random number generator to generate random points"); + b.add_input("Spacing") .default_value({0.3, 0.3, 0.3}) .min(0.0001f) .subtype(PROP_XYZ) - .description(N_("Spacing between grid points")); - b.add_input(N_("Threshold")) + .description("Spacing between grid points"); + b.add_input("Threshold") .default_value(0.1f) .min(0.0f) .max(FLT_MAX) - .description(N_("Minimum density of a volume cell to contain a grid point")); - b.add_output(N_("Points")).propagate_all(); + .description("Minimum density of a volume cell to contain a grid point"); + b.add_output("Points").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*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 a23ac36db3d..676c5faeecc 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 @@ -33,33 +33,30 @@ static void node_declare(NodeDeclarationBuilder &b) node.custom1 = GEO_NODE_POINT_DISTRIBUTE_POINTS_ON_FACES_POISSON; }; - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Distance Min")) + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Distance Min") .min(0.0f) .subtype(PROP_DISTANCE) .make_available(enable_poisson); - b.add_input(N_("Density Max")) + b.add_input("Density Max") .default_value(10.0f) .min(0.0f) .make_available(enable_poisson); - b.add_input(N_("Density")) - .default_value(10.0f) - .min(0.0f) - .field_on_all() - .make_available(enable_random); - b.add_input(N_("Density Factor")) + b.add_input("Density").default_value(10.0f).min(0.0f).field_on_all().make_available( + enable_random); + b.add_input("Density Factor") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) .field_on_all() .make_available(enable_poisson); - b.add_input(N_("Seed")); + b.add_input("Seed"); - b.add_output(N_("Points")).propagate_all(); - b.add_output(N_("Normal")).field_on_all(); - b.add_output(N_("Rotation")).subtype(PROP_EULER).field_on_all(); + b.add_output("Points").propagate_all(); + b.add_output("Normal").field_on_all(); + b.add_output("Rotation").subtype(PROP_EULER).field_on_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index f8f817444ba..5c8c6d29dc4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -28,20 +28,17 @@ NODE_STORAGE_FUNCS(NodeGeometryDuplicateElements); static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")).hide_value().default_value(true).field_on_all(); - b.add_input(N_("Amount")) - .min(0) - .default_value(1) - .field_on_all() - .description(N_("The number of duplicates to create for each element")); + b.add_input("Geometry"); + b.add_input("Selection").hide_value().default_value(true).field_on_all(); + b.add_input("Amount").min(0).default_value(1).field_on_all().description( + "The number of duplicates to create for each element"); - b.add_output(N_("Geometry")) + b.add_output("Geometry") .propagate_all() - .description(N_("The duplicated geometry, not including the original geometry")); - b.add_output(N_("Duplicate Index")) + .description("The duplicated geometry, not including the original geometry"); + b.add_output("Duplicate Index") .field_on_all() - .description(N_("The indices of the duplicates for each element")); + .description("The indices of the duplicates for each element"); } static void node_init(bNodeTree * /*tree*/, bNode *node) diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_curves.cc index d0bf6dd5d27..8a2e41100e1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_curves.cc @@ -12,10 +12,10 @@ namespace blender::nodes::node_geo_edge_paths_to_curves_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Start Vertices")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Next Vertex Index")).default_value(-1).hide_value().field_on_all(); - b.add_output(N_("Curves")).propagate_all(); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Start Vertices").default_value(true).hide_value().field_on_all(); + b.add_input("Next Vertex Index").default_value(-1).hide_value().field_on_all(); + b.add_output("Curves").propagate_all(); } static Curves *edge_paths_to_curves_convert( diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc index ad7d2c8b11a..132f5503c2b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc @@ -15,9 +15,9 @@ namespace blender::nodes::node_geo_edge_paths_to_selection_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Start Vertices")).default_value(true).hide_value().supports_field(); - b.add_input(N_("Next Vertex Index")).default_value(-1).hide_value().supports_field(); - b.add_output(N_("Selection")).field_source_reference_all(); + b.add_input("Start Vertices").default_value(true).hide_value().supports_field(); + b.add_input("Next Vertex Index").default_value(-1).hide_value().supports_field(); + b.add_output("Selection").field_source_reference_all(); } static void edge_paths_to_selection(const Mesh &src_mesh, 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 5292c8b1006..f4d75b537ca 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc @@ -10,9 +10,9 @@ namespace blender::nodes::node_geo_edge_split_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Mesh")).propagate_all(); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Mesh").propagate_all(); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc b/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc index cf3309aa7db..0399d8620c9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_edges_to_face_groups.cc @@ -15,10 +15,10 @@ static void node_declare(NodeDeclarationBuilder &b) .default_value(true) .hide_value() .supports_field() - .description(N_("Edges used to split faces into separate groups")); + .description("Edges used to split faces into separate groups"); b.add_output("Face Group ID") .dependent_field() - .description(N_("Index of the face group inside each boundary edge region")); + .description("Index of the face group inside each boundary edge region"); } /** Join all unique unordered combinations of indices. */ diff --git a/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc b/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc index 46f0f1eb125..ec51437a8f7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc @@ -54,19 +54,19 @@ namespace blender::nodes::node_geo_evaluate_at_index_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Index")).min(0).supports_field(); + b.add_input("Index").min(0).supports_field(); - b.add_input(N_("Value"), "Value_Float").hide_value().supports_field(); - b.add_input(N_("Value"), "Value_Int").hide_value().supports_field(); - b.add_input(N_("Value"), "Value_Vector").hide_value().supports_field(); - b.add_input(N_("Value"), "Value_Color").hide_value().supports_field(); - b.add_input(N_("Value"), "Value_Bool").hide_value().supports_field(); + b.add_input("Value", "Value_Float").hide_value().supports_field(); + b.add_input("Value", "Value_Int").hide_value().supports_field(); + b.add_input("Value", "Value_Vector").hide_value().supports_field(); + b.add_input("Value", "Value_Color").hide_value().supports_field(); + b.add_input("Value", "Value_Bool").hide_value().supports_field(); - b.add_output(N_("Value"), "Value_Float").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Int").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Vector").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Color").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Bool").field_source_reference_all(); + b.add_output("Value", "Value_Float").field_source_reference_all(); + b.add_output("Value", "Value_Int").field_source_reference_all(); + b.add_output("Value", "Value_Vector").field_source_reference_all(); + b.add_output("Value", "Value_Color").field_source_reference_all(); + b.add_output("Value", "Value_Bool").field_source_reference_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc b/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc index 7143f38cc2e..eceb8774c30 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc @@ -15,17 +15,17 @@ namespace blender::nodes::node_geo_evaluate_on_domain_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value"), "Value_Float").supports_field(); - b.add_input(N_("Value"), "Value_Int").supports_field(); - b.add_input(N_("Value"), "Value_Vector").supports_field(); - b.add_input(N_("Value"), "Value_Color").supports_field(); - b.add_input(N_("Value"), "Value_Bool").supports_field(); + b.add_input("Value", "Value_Float").supports_field(); + b.add_input("Value", "Value_Int").supports_field(); + b.add_input("Value", "Value_Vector").supports_field(); + b.add_input("Value", "Value_Color").supports_field(); + b.add_input("Value", "Value_Bool").supports_field(); - b.add_output(N_("Value"), "Value_Float").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Int").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Vector").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Color").field_source_reference_all(); - b.add_output(N_("Value"), "Value_Bool").field_source_reference_all(); + b.add_output("Value", "Value_Float").field_source_reference_all(); + b.add_output("Value", "Value_Int").field_source_reference_all(); + b.add_output("Value", "Value_Vector").field_source_reference_all(); + b.add_output("Value", "Value_Color").field_source_reference_all(); + b.add_output("Value", "Value_Bool").field_source_reference_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc index d2d0ea3dd04..42ee0e832d9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc @@ -25,18 +25,18 @@ NODE_STORAGE_FUNCS(NodeGeometryExtrudeMesh) static void node_declare(NodeDeclarationBuilder &b) { b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).field_on_all().hide_value(); - b.add_input(N_("Offset")) + b.add_input("Selection").default_value(true).field_on_all().hide_value(); + b.add_input("Offset") .subtype(PROP_TRANSLATION) .implicit_field_on_all(implicit_field_inputs::normal) .hide_value(); - b.add_input(N_("Offset Scale")).default_value(1.0f).field_on_all(); - b.add_input(N_("Individual")).default_value(true).make_available([](bNode &node) { + b.add_input("Offset Scale").default_value(1.0f).field_on_all(); + b.add_input("Individual").default_value(true).make_available([](bNode &node) { node_storage(node).mode = GEO_NODE_EXTRUDE_MESH_FACES; }); b.add_output("Mesh").propagate_all(); - b.add_output(N_("Top")).field_on_all(); - b.add_output(N_("Side")).field_on_all(); + b.add_output("Top").field_on_all(); + b.add_output("Side").field_on_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc index e88baa4bddd..6c8753ce625 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc @@ -15,9 +15,9 @@ namespace blender::nodes::node_geo_flip_faces_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Mesh")).propagate_all(); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Mesh").propagate_all(); } static void mesh_flip_faces(Mesh &mesh, const Field &selection_field) diff --git a/source/blender/nodes/geometry/nodes/node_geo_geometry_to_instance.cc b/source/blender/nodes/geometry/nodes/node_geo_geometry_to_instance.cc index ac155860b92..8b73bab2bdb 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_geometry_to_instance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_geometry_to_instance.cc @@ -8,8 +8,8 @@ namespace blender::nodes::node_geo_geometry_to_instance_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).multi_input(); - b.add_output(N_("Instances")).propagate_all(); + b.add_input("Geometry").multi_input(); + b.add_output("Instances").propagate_all(); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_image.cc b/source/blender/nodes/geometry/nodes/node_geo_image.cc index 6a008f3ead9..24eebd4afe6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_geo_image_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Image")); + b.add_output("Image"); } static void node_layout(uiLayout *layout, bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_info.cc b/source/blender/nodes/geometry/nodes/node_geo_image_info.cc index 826f85b8d85..3912c31ccab 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_info.cc @@ -17,21 +17,19 @@ namespace blender::nodes::node_geo_image_info_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).hide_label(); - b.add_input(N_("Frame")) - .min(0) - .description(N_("Which frame to use for videos. Note that different frames in videos can " - "have different resolutions")); + b.add_input("Image").hide_label(); + b.add_input("Frame").min(0).description( + "Which frame to use for videos. Note that different frames in videos can " + "have different resolutions"); - b.add_output(N_("Width")); - b.add_output(N_("Height")); - b.add_output(N_("Has Alpha")) - .description(N_("Whether the image has an alpha channel")); + b.add_output("Width"); + b.add_output("Height"); + b.add_output("Has Alpha").description("Whether the image has an alpha channel"); - b.add_output(N_("Frame Count")) - .description(N_("The number of animation frames. If a single image, then 1")); - b.add_output(N_("FPS")).description( - N_("Animation playback speed in frames per second. If a single image, then 0")); + b.add_output("Frame Count") + .description("The number of animation frames. If a single image, then 1"); + b.add_output("FPS").description( + "Animation playback speed in frames per second. If a single image, then 0"); } static void node_geo_exec(GeoNodeExecParams params) 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 fb12fe2a4d9..83114c97c6d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc @@ -22,13 +22,13 @@ NODE_STORAGE_FUNCS(NodeGeometryImageTexture) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Image")).hide_label(); - b.add_input(N_("Vector")) + b.add_input("Image").hide_label(); + b.add_input("Vector") .implicit_field(implicit_field_inputs::position) .description("Texture coordinates from 0 to 1"); - b.add_input(N_("Frame")).min(0).max(MAXFRAMEF); - b.add_output(N_("Color")).no_muted_links().dependent_field().reference_pass_all(); - b.add_output(N_("Alpha")).no_muted_links().dependent_field().reference_pass_all(); + b.add_input("Frame").min(0).max(MAXFRAMEF); + b.add_output("Color").no_muted_links().dependent_field().reference_pass_all(); + b.add_output("Alpha").no_muted_links().dependent_field().reference_pass_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_index_of_nearest.cc b/source/blender/nodes/geometry/nodes/node_geo_index_of_nearest.cc index 7afc0ea856d..80167a4b57a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_index_of_nearest.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_index_of_nearest.cc @@ -11,11 +11,11 @@ namespace blender::nodes::node_geo_index_of_nearest_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Position")).implicit_field(implicit_field_inputs::position); - b.add_input(N_("Group ID")).supports_field().hide_value(); + b.add_input("Position").implicit_field(implicit_field_inputs::position); + b.add_input("Group ID").supports_field().hide_value(); - b.add_output(N_("Index")).field_source().description(N_("Index of nearest element")); - b.add_output(N_("Has Neighbor")).field_source(); + b.add_output("Index").field_source().description("Index of nearest element"); + b.add_output("Has Neighbor").field_source(); } static KDTree_3d *build_kdtree(const Span positions, const IndexMask mask) 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 94b6947e14b..1230b346fd2 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 @@ -8,13 +8,14 @@ namespace blender::nodes::node_geo_input_curve_handles_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Relative")) + b.add_input("Relative") .default_value(false) .supports_field() - .description(N_("Output the handle positions relative to the corresponding control point " - "instead of in the local space of the geometry")); - b.add_output(N_("Left")).field_source_reference_all(); - b.add_output(N_("Right")).field_source_reference_all(); + .description( + "Output the handle positions relative to the corresponding control point " + "instead of in the local space of the geometry"); + b.add_output("Left").field_source_reference_all(); + b.add_output("Right").field_source_reference_all(); } class HandlePositionFieldInput final : public bke::CurvesFieldInput { 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 f9edf2ee071..411b33f2b34 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 @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_curve_tilt_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Tilt")).field_source(); + b.add_output("Tilt").field_source(); } static void node_geo_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 c21c7c65c8b..b803fbdfb25 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_id.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_id.cc @@ -6,9 +6,9 @@ namespace blender::nodes::node_geo_input_id_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("ID")).field_source().description( - N_("The values from the \"id\" attribute on points, or the index if that attribute does not " - "exist")); + b.add_output("ID").field_source().description( + "The values from the \"id\" attribute on points, or the index if that attribute does not " + "exist"); } static void node_geo_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 a1b7287f0bb..87ff1bac7ad 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_index.cc @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_index_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Index")).field_source(); + b.add_output("Index").field_source(); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc index 97a8491166c..059eda3447b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc @@ -10,7 +10,7 @@ namespace blender::nodes::node_geo_input_instance_rotation_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Rotation")).field_source(); + b.add_output("Rotation").field_source(); } class InstanceRotationFieldInput final : public bke::InstancesFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc index 6bf826dbddd..5e2e59af2ff 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc @@ -10,7 +10,7 @@ namespace blender::nodes::node_geo_input_instance_scale_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Scale")).field_source(); + b.add_output("Scale").field_source(); } class InstanceScaleFieldInput final : public bke::InstancesFieldInput { 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 943193a0d82..832851461d1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc @@ -9,7 +9,7 @@ namespace blender::nodes::node_geo_input_material_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Material")); + b.add_output("Material"); } static void node_layout(uiLayout *layout, bContext * /*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 55b8be69eb6..b6f4c06672e 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 @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_material_index_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Material Index")).field_source(); + b.add_output("Material Index").field_source(); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc index 179aa1e61d4..b0f07cb2ebd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc @@ -14,13 +14,13 @@ namespace blender::nodes::node_geo_input_mesh_edge_angle_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Unsigned Angle")) + b.add_output("Unsigned Angle") .field_source() .description( "The shortest angle in radians between two faces where they meet at an edge. Flat edges " "and Non-manifold edges have an angle of zero. Computing this value is faster than the " "signed angle"); - b.add_output(N_("Signed Angle")) + b.add_output("Signed Angle") .field_source() .description( "The signed angle in radians between two faces where they meet at an edge. Flat edges " diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc index 03018baa81a..7120456b0e2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc @@ -11,9 +11,9 @@ namespace blender::nodes::node_geo_input_mesh_edge_neighbors_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Face Count")) + b.add_output("Face Count") .field_source() - .description(N_("The number of faces that use each edge as one of their sides")); + .description("The number of faces that use each edge as one of their sides"); } class EdgeNeighborCountFieldInput final : public bke::MeshFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc index ff0b63f3825..e3959b788d1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc @@ -11,18 +11,18 @@ namespace blender::nodes::node_geo_input_mesh_edge_vertices_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Vertex Index 1")) + b.add_output("Vertex Index 1") .field_source() - .description(N_("The index of the first vertex in the edge")); - b.add_output(N_("Vertex Index 2")) + .description("The index of the first vertex in the edge"); + b.add_output("Vertex Index 2") .field_source() - .description(N_("The index of the second vertex in the edge")); - b.add_output(N_("Position 1")) + .description("The index of the second vertex in the edge"); + b.add_output("Position 1") .field_source() - .description(N_("The position of the first vertex in the edge")); - b.add_output(N_("Position 2")) + .description("The position of the first vertex in the edge"); + b.add_output("Position 2") .field_source() - .description(N_("The position of the second vertex in the edge")); + .description("The position of the second vertex in the edge"); } enum class VertNumber { V1, V2 }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc index c48162b5b61..be32f6369c5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc @@ -13,10 +13,10 @@ namespace blender::nodes::node_geo_input_mesh_face_area_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(CTX_N_(BLT_I18NCONTEXT_AMOUNT, "Area")) + b.add_output("Area") .translation_context(BLT_I18NCONTEXT_AMOUNT) .field_source() - .description(N_("The surface area of each of the mesh's faces")); + .description("The surface area of each of the mesh's faces"); } static VArray construct_face_area_varray(const Mesh &mesh, const eAttrDomain domain) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc index 300db439ba9..3c63d3a9615 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc @@ -18,8 +18,9 @@ static void node_declare(NodeDeclarationBuilder &b) .default_value(0.01f) .subtype(PROP_DISTANCE) .supports_field() - .description(N_("The distance a point can be from the surface before the face is no longer " - "considered planar")) + .description( + "The distance a point can be from the surface before the face is no longer " + "considered planar") .min(0.0f); b.add_output("Planar").field_source(); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc index dbd3d7c475f..3ca16a1b864 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc @@ -11,12 +11,12 @@ namespace blender::nodes::node_geo_input_mesh_face_neighbors_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Vertex Count")) + b.add_output("Vertex Count") .field_source() - .description(N_("Number of edges or points in the face")); - b.add_output(N_("Face Count")) + .description("Number of edges or points in the face"); + b.add_output("Face Count") .field_source() - .description(N_("Number of faces which share an edge with the face")); + .description("Number of faces which share an edge with the face"); } static VArray construct_neighbor_count_varray(const Mesh &mesh, const eAttrDomain domain) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc index f98d1297373..a692cc909f3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc @@ -14,13 +14,14 @@ namespace blender::nodes::node_geo_input_mesh_island_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Island Index")) + b.add_output("Island Index") .field_source() - .description(N_("The index of the each vertex's island. Indices are based on the " - "lowest vertex index contained in each island")); - b.add_output(N_("Island Count")) + .description( + "The index of the each vertex's island. Indices are based on the " + "lowest vertex index contained in each island"); + b.add_output("Island Count") .field_source() - .description(N_("The total number of mesh islands")); + .description("The total number of mesh islands"); } class IslandFieldInput final : public bke::MeshFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc index 3f0b4c131f5..ac477136222 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc @@ -11,13 +11,14 @@ namespace blender::nodes::node_geo_input_mesh_vertex_neighbors_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Vertex Count")) + b.add_output("Vertex Count") .field_source() - .description(N_("The number of vertices connected to this vertex with an edge, " - "equal to the number of connected edges")); - b.add_output(N_("Face Count")) + .description( + "The number of vertices connected to this vertex with an edge, " + "equal to the number of connected edges"); + b.add_output("Face Count") .field_source() - .description(N_("Number of faces that contain the vertex")); + .description("Number of faces that contain the vertex"); } static VArray construct_vertex_count_gvarray(const Mesh &mesh, const eAttrDomain domain) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc index f2287c0ac57..827b0860373 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc @@ -13,15 +13,15 @@ NODE_STORAGE_FUNCS(NodeGeometryInputNamedAttribute) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Name")).is_attribute_name(); + b.add_input("Name").is_attribute_name(); - b.add_output(N_("Attribute"), "Attribute_Vector").field_source(); - b.add_output(N_("Attribute"), "Attribute_Float").field_source(); - b.add_output(N_("Attribute"), "Attribute_Color").field_source(); - b.add_output(N_("Attribute"), "Attribute_Bool").field_source(); - b.add_output(N_("Attribute"), "Attribute_Int").field_source(); + b.add_output("Attribute", "Attribute_Vector").field_source(); + b.add_output("Attribute", "Attribute_Float").field_source(); + b.add_output("Attribute", "Attribute_Color").field_source(); + b.add_output("Attribute", "Attribute_Bool").field_source(); + b.add_output("Attribute", "Attribute_Int").field_source(); - b.add_output(N_("Exists")).field_source(); + b.add_output("Exists").field_source(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 756f9123f2b..0b59c09833b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_normal_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Normal")).field_source(); + b.add_output("Normal").field_source(); } static void node_geo_exec(GeoNodeExecParams params) 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 62e13670df3..9106f419806 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_position.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_position.cc @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_position_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Position")).field_source(); + b.add_output("Position").field_source(); } static void node_geo_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 97ca98c631c..06838134193 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_radius.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_radius.cc @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_radius_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Radius")).default_value(1.0f).min(0.0f).field_source(); + b.add_output("Radius").default_value(1.0f).min(0.0f).field_source(); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc b/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc index 74d10c286a0..58165dca752 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc @@ -10,8 +10,8 @@ namespace blender::nodes::node_geo_input_scene_time_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Seconds")); - b.add_output(N_("Frame")); + b.add_output("Seconds"); + b.add_output("Frame"); } static void node_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 dd54bf1136e..79dd08424dd 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 @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_shade_smooth_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Smooth")).field_source(); + b.add_output("Smooth").field_source(); } static void node_geo_exec(GeoNodeExecParams params) diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc b/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc index c801f3e8a89..2ff5e68b266 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc @@ -15,10 +15,10 @@ namespace blender::nodes::node_geo_input_shortest_edge_paths_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("End Vertex")).default_value(false).hide_value().supports_field(); - b.add_input(N_("Edge Cost")).default_value(1.0f).hide_value().supports_field(); - b.add_output(N_("Next Vertex Index")).field_source(); - b.add_output(N_("Total Cost")).field_source(); + b.add_input("End Vertex").default_value(false).hide_value().supports_field(); + b.add_input("Edge Cost").default_value(1.0f).hide_value().supports_field(); + b.add_output("Next Vertex Index").field_source(); + b.add_output("Total Cost").field_source(); } typedef std::pair VertPriority; diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_signed_distance.cc b/source/blender/nodes/geometry/nodes/node_geo_input_signed_distance.cc index c433869aec5..6934bd14ad4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_signed_distance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_signed_distance.cc @@ -9,7 +9,7 @@ namespace blender::nodes::node_geo_input_signed_distance_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Signed Distance")).field_source(); + b.add_output("Signed Distance").field_source(); } static void search_node_add_ops(GatherAddNodeSearchParams ¶ms) 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 f76e988ffeb..997062a84f9 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 @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_input_spline_cyclic_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Cyclic")).field_source(); + b.add_output("Cyclic").field_source(); } static void node_geo_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 137371d8928..ce6ecb3572b 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 @@ -8,8 +8,8 @@ namespace blender::nodes::node_geo_input_spline_length_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Length")).field_source(); - b.add_output(N_("Point Count")).field_source(); + b.add_output("Length").field_source(); + b.add_output("Point Count").field_source(); } /* -------------------------------------------------------------------- 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 741bd293225..97d9dc6261c 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 @@ -8,7 +8,7 @@ namespace blender::nodes::node_geo_input_spline_resolution_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Resolution")).field_source(); + b.add_output("Resolution").field_source(); } class ResolutionFieldInput final : public bke::CurvesFieldInput { 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 0ec26a60ebd..c9876c1ee2d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc @@ -10,7 +10,7 @@ namespace blender::nodes::node_geo_input_tangent_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Tangent")).field_source(); + b.add_output("Tangent").field_source(); } static Array curve_tangent_point_domain(const bke::CurvesGeometry &curves) 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 59a61b6cce6..931486918a5 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 @@ -19,30 +19,30 @@ namespace blender::nodes::node_geo_instance_on_points_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Points")).description(N_("Points to instance on")); - b.add_input(N_("Selection")).default_value(true).field_on({0}).hide_value(); - b.add_input(N_("Instance")) - .description(N_("Geometry that is instanced on the points")); - b.add_input(N_("Pick Instance")) + b.add_input("Points").description("Points to instance on"); + b.add_input("Selection").default_value(true).field_on({0}).hide_value(); + b.add_input("Instance").description("Geometry that is instanced on the points"); + b.add_input("Pick Instance") .field_on({0}) - .description(N_("Choose instances from the \"Instance\" input at each point instead of " - "instancing the entire geometry")); - b.add_input(N_("Instance Index")) + .description( + "Choose instances from the \"Instance\" input at each point instead of instancing the " + "entire geometry"); + b.add_input("Instance Index") .implicit_field_on(implicit_field_inputs::id_or_index, {0}) .description( - N_("Index of the instance used for each point. This is only used when Pick Instances " - "is on. By default the point index is used")); - b.add_input(N_("Rotation")) + "Index of the instance used for each point. This is only used when Pick Instances " + "is on. By default the point index is used"); + b.add_input("Rotation") .subtype(PROP_EULER) .field_on({0}) - .description(N_("Rotation of the instances")); - b.add_input(N_("Scale")) + .description("Rotation of the instances"); + b.add_input("Scale") .default_value({1.0f, 1.0f, 1.0f}) .subtype(PROP_XYZ) .field_on({0}) - .description(N_("Scale of the instances")); + .description("Scale of the instances"); - b.add_output(N_("Instances")).propagate_all(); + b.add_output("Instances").propagate_all(); } static void add_instances_from_component( @@ -170,7 +170,8 @@ static void add_instances_from_component( const eCustomDataType type = bke::cpp_type_to_custom_data_type(src.varray.type()); if (src.varray.size() == dst_component.instances_num() && src.sharing_info && - src.varray.is_span()) { + src.varray.is_span()) + { const bke::AttributeInitShared init(src.varray.get_internal_span().data(), *src.sharing_info); dst_attributes.add(id, ATTR_DOMAIN_INSTANCE, type, init); 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 193fc02924e..844064c8ed0 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 @@ -14,15 +14,15 @@ namespace blender::nodes::node_geo_instances_to_points_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Instances")).only_instances(); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Position")).implicit_field_on_all(implicit_field_inputs::position); - b.add_input(N_("Radius")) + b.add_input("Instances").only_instances(); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Position").implicit_field_on_all(implicit_field_inputs::position); + b.add_input("Radius") .default_value(0.05f) .min(0.0f) .subtype(PROP_DISTANCE) .field_on_all(); - b.add_output(N_("Points")).propagate_all(); + b.add_output("Points").propagate_all(); } static void convert_instances_to_points(GeometrySet &geometry_set, diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc index a22599ec44d..45b5a107087 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc @@ -15,39 +15,40 @@ namespace blender::nodes::node_geo_interpolate_curves_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Guide Curves")) - .description(N_("Base curves that new curves are interpolated between")); - b.add_input(N_("Guide Up")) + b.add_input("Guide Curves") + .description("Base curves that new curves are interpolated between"); + b.add_input("Guide Up") .field_on({0}) .hide_value() - .description(N_("Optional up vector that is typically a surface normal")); - b.add_input(N_("Guide Group ID")) + .description("Optional up vector that is typically a surface normal"); + b.add_input("Guide Group ID") .field_on({0}) .hide_value() - .description(N_("Splits guides into separate groups. New curves interpolate existing curves " - "from a single group")); - b.add_input(N_("Points")) - .description(N_("First control point positions for new interpolated curves")); - b.add_input(N_("Point Up")) + .description( + "Splits guides into separate groups. New curves interpolate existing curves " + "from a single group"); + b.add_input("Points").description( + "First control point positions for new interpolated curves"); + b.add_input("Point Up") .field_on({3}) .hide_value() - .description(N_("Optional up vector that is typically a surface normal")); - b.add_input(N_("Point Group ID")) + .description("Optional up vector that is typically a surface normal"); + b.add_input("Point Group ID") .field_on({3}) .hide_value() - .description(N_("The curve group to interpolate in")); - b.add_input(N_("Max Neighbors")) + .description("The curve group to interpolate in"); + b.add_input("Max Neighbors") .default_value(4) .min(1) - .description(N_( - "Maximum amount of close guide curves that are taken into account for interpolation")); - b.add_output(N_("Curves")).propagate_all(); - b.add_output(N_("Closest Index")) + .description( + "Maximum amount of close guide curves that are taken into account for interpolation"); + b.add_output("Curves").propagate_all(); + b.add_output("Closest Index") .field_on_all() - .description(N_("Index of the closest guide curve for each generated curve")); - b.add_output(N_("Closest Weight")) + .description("Index of the closest guide curve for each generated curve"); + b.add_output("Closest Weight") .field_on_all() - .description(N_("Weight of the closest guide curve for each generated curve")); + .description("Weight of the closest guide curve for each generated curve"); } /** 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 aa52a6a0246..18fda469869 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc @@ -8,7 +8,7 @@ namespace blender::nodes::node_geo_is_viewport_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Is Viewport")); + b.add_output("Is Viewport"); } static void node_geo_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 a7f82631010..38703b8b29d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -10,8 +10,8 @@ namespace blender::nodes::node_geo_join_geometry_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).multi_input(); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry").multi_input(); + b.add_output("Geometry").propagate_all(); } template 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 ed029948101..bd4c8c53945 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc @@ -14,10 +14,10 @@ namespace blender::nodes::node_geo_material_replace_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Old")); - b.add_input(N_("New")).translation_context(BLT_I18NCONTEXT_ID_MATERIAL); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Old"); + b.add_input("New").translation_context(BLT_I18NCONTEXT_ID_MATERIAL); + b.add_output("Geometry").propagate_all(); } static void node_geo_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 db852a3d18f..273130cee66 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc @@ -16,8 +16,8 @@ namespace blender::nodes::node_geo_material_selection_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Material")).hide_label(true); - b.add_output(N_("Selection")).field_source(); + b.add_input("Material").hide_label(true); + b.add_output("Selection").field_source(); } static VArray select_mesh_faces_by_material(const Mesh &mesh, diff --git a/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc index 8c1dcee2f8d..0459f97ebd1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc @@ -22,13 +22,12 @@ namespace blender::nodes::node_geo_mean_filter_sdf_volume_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) + b.add_input("Volume") .supported_type(GEO_COMPONENT_TYPE_VOLUME) .translation_context(BLT_I18NCONTEXT_ID_ID); - b.add_input(N_("Iterations")).min(1).max(256).default_value(1); - b.add_input(N_("Width")).min(0).default_value(1); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Iterations").min(1).max(256).default_value(1); + b.add_input("Width").min(0).default_value(1); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void search_node_add_ops(GatherAddNodeSearchParams ¶ms) diff --git a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc index 22f40fc2b36..0f21354766f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc @@ -17,11 +17,11 @@ NODE_STORAGE_FUNCS(NodeGeometryMergeByDistance) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")) + b.add_input("Geometry") .supported_type({GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_MESH}); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Distance")).default_value(0.001f).min(0.0f).subtype(PROP_DISTANCE); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Distance").default_value(0.001f).min(0.0f).subtype(PROP_DISTANCE); + b.add_output("Geometry").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc index 4c95ebfc091..f8b7c528170 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc @@ -11,15 +11,16 @@ namespace blender::nodes::node_geo_mesh_face_group_boundaries_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Face Group ID"), "Face Set") + b.add_input("Face Group ID", "Face Set") .default_value(0) .hide_value() .supports_field() - .description(N_("An identifier for the group of each face. All contiguous faces with the " - "same value are in the same region")); - b.add_output(N_("Boundary Edges")) + .description( + "An identifier for the group of each face. All contiguous faces with the " + "same value are in the same region"); + b.add_output("Boundary Edges") .field_source_reference_all() - .description(N_("The edges that lie on the boundaries between the different face groups")); + .description("The edges that lie on the boundaries between the different face groups"); } class BoundaryFieldInput final : public bke::MeshFieldInput { 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 f301cca32df..1b7503ae877 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 @@ -17,16 +17,16 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshCircle) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vertices")) + b.add_input("Vertices") .default_value(32) .min(3) - .description(N_("Number of vertices on the circle")); - b.add_input(N_("Radius")) + .description("Number of vertices on the circle"); + b.add_input("Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Distance of the vertices from the origin")); - b.add_output(N_("Mesh")); + .description("Distance of the vertices from the origin"); + b.add_output("Mesh"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 26d178c466f..19576fa2812 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 @@ -738,40 +738,40 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshCone) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vertices")) + b.add_input("Vertices") .default_value(32) .min(3) .max(512) - .description(N_("Number of points on the circle at the top and bottom")); - b.add_input(N_("Side Segments")) + .description("Number of points on the circle at the top and bottom"); + b.add_input("Side Segments") .default_value(1) .min(1) .max(512) - .description(N_("The number of edges running vertically along the side of the cone")); - b.add_input(N_("Fill Segments")) + .description("The number of edges running vertically along the side of the cone"); + b.add_input("Fill Segments") .default_value(1) .min(1) .max(512) - .description(N_("Number of concentric rings used to fill the round face")); - b.add_input(N_("Radius Top")) + .description("Number of concentric rings used to fill the round face"); + b.add_input("Radius Top") .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Radius of the top circle of the cone")); - b.add_input(N_("Radius Bottom")) + .description("Radius of the top circle of the cone"); + b.add_input("Radius Bottom") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Radius of the bottom circle of the cone")); - b.add_input(N_("Depth")) + .description("Radius of the bottom circle of the cone"); + b.add_input("Depth") .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Height of the generated cone")); - b.add_output(N_("Mesh")); - b.add_output(N_("Top")).field_on_all(); - b.add_output(N_("Bottom")).field_on_all(); - b.add_output(N_("Side")).field_on_all(); - b.add_output(N_("UV Map")).field_on_all(); + .description("Height of the generated cone"); + b.add_output("Mesh"); + b.add_output("Top").field_on_all(); + b.add_output("Bottom").field_on_all(); + b.add_output("Side").field_on_all(); + b.add_output("UV Map").field_on_all(); } static void node_init(bNodeTree * /*tree*/, 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 06524293d69..81120704e94 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 @@ -14,28 +14,28 @@ namespace blender::nodes::node_geo_mesh_primitive_cube_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Size")) + b.add_input("Size") .default_value(float3(1)) .min(0.0f) .subtype(PROP_TRANSLATION) - .description(N_("Side length along each axis")); - b.add_input(N_("Vertices X")) + .description("Side length along each axis"); + b.add_input("Vertices X") .default_value(2) .min(2) .max(1000) - .description(N_("Number of vertices for the X side of the shape")); - b.add_input(N_("Vertices Y")) + .description("Number of vertices for the X side of the shape"); + b.add_input("Vertices Y") .default_value(2) .min(2) .max(1000) - .description(N_("Number of vertices for the Y side of the shape")); - b.add_input(N_("Vertices Z")) + .description("Number of vertices for the Y side of the shape"); + b.add_input("Vertices Z") .default_value(2) .min(2) .max(1000) - .description(N_("Number of vertices for the Z side of the shape")); - b.add_output(N_("Mesh")); - b.add_output(N_("UV Map")).field_on_all(); + .description("Number of vertices for the Z side of the shape"); + b.add_output("Mesh"); + b.add_output("UV Map").field_on_all(); } static Mesh *create_cuboid_mesh(const float3 &size, 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 0672bea4435..808e5731fc6 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 @@ -17,36 +17,36 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshCylinder) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vertices")) + b.add_input("Vertices") .default_value(32) .min(3) .max(512) - .description(N_("The number of vertices on the top and bottom circles")); - b.add_input(N_("Side Segments")) + .description("The number of vertices on the top and bottom circles"); + b.add_input("Side Segments") .default_value(1) .min(1) .max(512) - .description(N_("The number of rectangular segments along each side")); - b.add_input(N_("Fill Segments")) + .description("The number of rectangular segments along each side"); + b.add_input("Fill Segments") .default_value(1) .min(1) .max(512) - .description(N_("The number of concentric rings used to fill the round faces")); - b.add_input(N_("Radius")) + .description("The number of concentric rings used to fill the round faces"); + b.add_input("Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The radius of the cylinder")); - b.add_input(N_("Depth")) + .description("The radius of the cylinder"); + b.add_input("Depth") .default_value(2.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("The height of the cylinder")); - b.add_output(N_("Mesh")); - b.add_output(N_("Top")).field_on_all(); - b.add_output(N_("Side")).field_on_all(); - b.add_output(N_("Bottom")).field_on_all(); - b.add_output(N_("UV Map")).field_on_all(); + .description("The height of the cylinder"); + b.add_output("Mesh"); + b.add_output("Top").field_on_all(); + b.add_output("Side").field_on_all(); + b.add_output("Bottom").field_on_all(); + b.add_output("UV Map").field_on_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 972a451b140..9805e775c4c 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 @@ -164,28 +164,28 @@ namespace blender::nodes::node_geo_mesh_primitive_grid_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Size X")) + b.add_input("Size X") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Side length of the plane in the X direction")); - b.add_input(N_("Size Y")) + .description("Side length of the plane in the X direction"); + b.add_input("Size Y") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Side length of the plane in the Y direction")); - b.add_input(N_("Vertices X")) + .description("Side length of the plane in the Y direction"); + b.add_input("Vertices X") .default_value(3) .min(2) .max(1000) - .description(N_("Number of vertices in the X direction")); - b.add_input(N_("Vertices Y")) + .description("Number of vertices in the X direction"); + b.add_input("Vertices Y") .default_value(3) .min(2) .max(1000) - .description(N_("Number of vertices in the Y direction")); - b.add_output(N_("Mesh")); - b.add_output(N_("UV Map")).field_on_all(); + .description("Number of vertices in the Y direction"); + b.add_output("Mesh"); + b.add_output("UV Map").field_on_all(); } static void node_geo_exec(GeoNodeExecParams params) 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 9d71bd3cf53..f853894eb07 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 @@ -14,18 +14,18 @@ namespace blender::nodes::node_geo_mesh_primitive_ico_sphere_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Radius")) + b.add_input("Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Distance from the generated points to the origin")); - b.add_input(N_("Subdivisions")) + .description("Distance from the generated points to the origin"); + b.add_input("Subdivisions") .default_value(1) .min(1) .max(7) - .description(N_("Number of subdivisions on top of the basic icosahedron")); - b.add_output(N_("Mesh")); - b.add_output(N_("UV Map")).field_on_all(); + .description("Number of subdivisions on top of the basic icosahedron"); + b.add_output("Mesh"); + b.add_output("UV Map").field_on_all(); } static Bounds calculate_bounds_ico_sphere(const float radius, const int subdivisions) 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 655ff98b93c..881337f68e3 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 @@ -22,26 +22,23 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshLine) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Count")) - .default_value(10) - .min(1) - .max(10000) - .description(N_("Number of vertices on the line")); - b.add_input(N_("Resolution")) + b.add_input("Count").default_value(10).min(1).max(10000).description( + "Number of vertices on the line"); + b.add_input("Resolution") .default_value(1.0f) .min(0.1f) .subtype(PROP_DISTANCE) - .description(N_("Length of each individual edge")); - b.add_input(N_("Start Location")) + .description("Length of each individual edge"); + b.add_input("Start Location") .subtype(PROP_TRANSLATION) - .description(N_("Position of the first vertex")); - b.add_input(N_("Offset")) + .description("Position of the first vertex"); + b.add_input("Offset") .default_value({0.0f, 0.0f, 1.0f}) .subtype(PROP_TRANSLATION) - .description(N_( + .description( "In offset mode, the distance between each socket on each axis. In end points mode, the " - "position of the final vertex")); - b.add_output(N_("Mesh")); + "position of the final vertex"); + b.add_output("Mesh"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 0d106669de7..ec4f557353a 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 @@ -17,23 +17,20 @@ namespace blender::nodes::node_geo_mesh_primitive_uv_sphere_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Segments")) + b.add_input("Segments") .default_value(32) .min(3) .max(1024) - .description(N_("Horizontal resolution of the sphere")); - b.add_input(N_("Rings")) - .default_value(16) - .min(2) - .max(1024) - .description(N_("The number of horizontal rings")); - b.add_input(N_("Radius")) + .description("Horizontal resolution of the sphere"); + b.add_input("Rings").default_value(16).min(2).max(1024).description( + "The number of horizontal rings"); + b.add_input("Radius") .default_value(1.0f) .min(0.0f) .subtype(PROP_DISTANCE) - .description(N_("Distance from the generated points to the origin")); - b.add_output(N_("Mesh")); - b.add_output(N_("UV Map")).field_on_all(); + .description("Distance from the generated points to the origin"); + b.add_output("Mesh"); + b.add_output("UV Map").field_on_all(); } 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 99f3eb1f025..88f50fc0d5e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc @@ -13,9 +13,9 @@ namespace blender::nodes::node_geo_mesh_subdivide_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Level")).default_value(1).min(0).max(6); - b.add_output(N_("Mesh")).propagate_all(); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Level").default_value(1).min(0).max(6); + b.add_output("Mesh").propagate_all(); } #ifdef WITH_OPENSUBDIV 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 2d38c823d43..ab6ea041965 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 @@ -10,9 +10,9 @@ namespace blender::nodes::node_geo_mesh_to_curve_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Curve").propagate_all(); } static void node_geo_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 4d41593bf61..f8a0c5e6fb6 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 @@ -23,15 +23,15 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshToPoints) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).field_on_all().hide_value(); - b.add_input(N_("Position")).implicit_field_on_all(implicit_field_inputs::position); - b.add_input(N_("Radius")) + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).field_on_all().hide_value(); + b.add_input("Position").implicit_field_on_all(implicit_field_inputs::position); + b.add_input("Radius") .default_value(0.05f) .min(0.0f) .subtype(PROP_DISTANCE) .field_on_all(); - b.add_output(N_("Points")).propagate_all(); + b.add_output("Points").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc index 713970b3cf1..970f6ba7655 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc @@ -27,20 +27,19 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshToVolume) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Voxel Size")) + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Voxel Size") .default_value(0.3f) .min(0.01f) .max(FLT_MAX) .subtype(PROP_DISTANCE); - b.add_input(N_("Voxel Amount")).default_value(64.0f).min(0.0f).max(FLT_MAX); - b.add_input(N_("Half-Band Width")) - .description(N_("Half the width of the narrow band in voxel units")) + b.add_input("Voxel Amount").default_value(64.0f).min(0.0f).max(FLT_MAX); + b.add_input("Half-Band Width") + .description("Half the width of the narrow band in voxel units") .default_value(3.0f) .min(1.01f) .max(10.0f); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void search_node_add_ops(GatherAddNodeSearchParams ¶ms) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc index 3c283241f13..7bb2853b4e2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc @@ -24,22 +24,21 @@ NODE_STORAGE_FUNCS(NodeGeometryMeshToVolume) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Density")).default_value(1.0f).min(0.01f).max(FLT_MAX); - b.add_input(N_("Voxel Size")) + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Density").default_value(1.0f).min(0.01f).max(FLT_MAX); + b.add_input("Voxel Size") .default_value(0.3f) .min(0.01f) .max(FLT_MAX) .subtype(PROP_DISTANCE); - b.add_input(N_("Voxel Amount")).default_value(64.0f).min(0.0f).max(FLT_MAX); - b.add_input(N_("Interior Band Width")) + b.add_input("Voxel Amount").default_value(64.0f).min(0.0f).max(FLT_MAX); + b.add_input("Interior Band Width") .default_value(0.2f) .min(0.0001f) .max(FLT_MAX) .subtype(PROP_DISTANCE) - .description(N_("Width of the gradient inside of the mesh")); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + .description("Width of the gradient inside of the mesh"); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc index 62bb8a8b33e..beb6e557575 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc @@ -10,24 +10,20 @@ namespace blender::nodes::node_geo_mesh_topology_corners_of_face_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Face Index")) + b.add_input("Face Index") .implicit_field(implicit_field_inputs::index) - .description(N_("The face to retrieve data from. Defaults to the face from the context")); - b.add_input(N_("Weights")) - .supports_field() - .hide_value() - .description(N_("Values used to sort the face's corners. Uses indices by default")); - b.add_input(N_("Sort Index")) + .description("The face to retrieve data from. Defaults to the face from the context"); + b.add_input("Weights").supports_field().hide_value().description( + "Values used to sort the face's corners. Uses indices by default"); + b.add_input("Sort Index") .min(0) .supports_field() - .description(N_("Which of the sorted corners to output")); - b.add_output(N_("Corner Index")) + .description("Which of the sorted corners to output"); + b.add_output("Corner Index") .field_source_reference_all() - .description(N_("A corner of the face, chosen by the sort index")); - b.add_output(N_("Total")) - .field_source() - .reference_pass({0}) - .description(N_("The number of corners in the face")); + .description("A corner of the face, chosen by the sort index"); + b.add_output("Total").field_source().reference_pass({0}).description( + "The number of corners in the face"); } class CornersOfFaceInput final : public bke::MeshFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc index 3df755bbd3d..b5ff2f3a7dc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc @@ -11,26 +11,20 @@ namespace blender::nodes::node_geo_mesh_topology_corners_of_vertex_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vertex Index")) + b.add_input("Vertex Index") .implicit_field(implicit_field_inputs::index) - .description( - N_("The vertex to retrieve data from. Defaults to the vertex from the context")); - b.add_input(N_("Weights")) - .supports_field() - .hide_value() - .description( - N_("Values used to sort corners attached to the vertex. Uses indices by default")); - b.add_input(N_("Sort Index")) + .description("The vertex to retrieve data from. Defaults to the vertex from the context"); + b.add_input("Weights").supports_field().hide_value().description( + "Values used to sort corners attached to the vertex. Uses indices by default"); + b.add_input("Sort Index") .min(0) .supports_field() - .description(N_("Which of the sorted corners to output")); - b.add_output(N_("Corner Index")) + .description("Which of the sorted corners to output"); + b.add_output("Corner Index") .field_source_reference_all() - .description(N_("A corner connected to the face, chosen by the sort index")); - b.add_output(N_("Total")) - .field_source() - .reference_pass({0}) - .description(N_("The number of faces or corners connected to each vertex")); + .description("A corner connected to the face, chosen by the sort index"); + b.add_output("Total").field_source().reference_pass({0}).description( + "The number of faces or corners connected to each vertex"); } static void convert_span(const Span src, MutableSpan dst) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc index fd4dd8acf8b..2bd74c25838 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc @@ -11,18 +11,17 @@ namespace blender::nodes::node_geo_mesh_topology_edges_of_corner_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Corner Index")) + b.add_input("Corner Index") .implicit_field(implicit_field_inputs::index) - .description( - N_("The corner to retrieve data from. Defaults to the corner from the context")); - b.add_output(N_("Next Edge Index")) + .description("The corner to retrieve data from. Defaults to the corner from the context"); + b.add_output("Next Edge Index") .field_source_reference_all() .description( - N_("The edge after the corner in the face, in the direction of increasing indices")); - b.add_output(N_("Previous Edge Index")) + "The edge after the corner in the face, in the direction of increasing indices"); + b.add_output("Previous Edge Index") .field_source_reference_all() .description( - N_("The edge before the corner in the face, in the direction of decreasing indices")); + "The edge before the corner in the face, in the direction of decreasing indices"); } class CornerNextEdgeFieldInput final : public bke::MeshFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc index f14ac286c37..c44771657e0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc @@ -11,26 +11,20 @@ namespace blender::nodes::node_geo_mesh_topology_edges_of_vertex_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vertex Index")) + b.add_input("Vertex Index") .implicit_field(implicit_field_inputs::index) - .description( - N_("The vertex to retrieve data from. Defaults to the vertex from the context")); - b.add_input(N_("Weights")) - .supports_field() - .hide_value() - .description( - N_("Values used to sort the edges connected to the vertex. Uses indices by default")); - b.add_input(N_("Sort Index")) + .description("The vertex to retrieve data from. Defaults to the vertex from the context"); + b.add_input("Weights").supports_field().hide_value().description( + "Values used to sort the edges connected to the vertex. Uses indices by default"); + b.add_input("Sort Index") .min(0) .supports_field() - .description(N_("Which of the sorted edges to output")); - b.add_output(N_("Edge Index")) + .description("Which of the sorted edges to output"); + b.add_output("Edge Index") .field_source_reference_all() - .description(N_("An edge connected to the face, chosen by the sort index")); - b.add_output(N_("Total")) - .field_source() - .reference_pass({0}) - .description(N_("The number of edges connected to each vertex")); + .description("An edge connected to the face, chosen by the sort index"); + b.add_output("Total").field_source().reference_pass({0}).description( + "The number of edges connected to each vertex"); } static void convert_span(const Span src, MutableSpan dst) diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc index 84ced00960a..efe7d3835ac 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc @@ -9,16 +9,15 @@ namespace blender::nodes::node_geo_mesh_topology_face_of_corner_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Corner Index")) + b.add_input("Corner Index") .implicit_field(implicit_field_inputs::index) - .description( - N_("The corner to retrieve data from. Defaults to the corner from the context")); - b.add_output(N_("Face Index")) + .description("The corner to retrieve data from. Defaults to the corner from the context"); + b.add_output("Face Index") .field_source_reference_all() - .description(N_("The index of the face the corner is a part of")); - b.add_output(N_("Index in Face")) + .description("The index of the face the corner is a part of"); + b.add_output("Index in Face") .field_source_reference_all() - .description(N_("The index of the corner starting from the first corner in the face")); + .description("The index of the corner starting from the first corner in the face"); } class CornerFaceIndexInput final : public bke::MeshFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc index f35ce663a43..8b22769e59a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc @@ -11,17 +11,15 @@ namespace blender::nodes::node_geo_mesh_topology_offset_corner_in_face_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Corner Index")) + b.add_input("Corner Index") .implicit_field(implicit_field_inputs::index) - .description( - N_("The corner to retrieve data from. Defaults to the corner from the context")); - b.add_input(N_("Offset")) - .supports_field() - .description(N_("The number of corners to move around the face before finding the result, " - "circling around the start of the face if necessary")); - b.add_output(N_("Corner Index")) + .description("The corner to retrieve data from. Defaults to the corner from the context"); + b.add_input("Offset").supports_field().description( + "The number of corners to move around the face before finding the result, " + "circling around the start of the face if necessary"); + b.add_output("Corner Index") .field_source_reference_all() - .description(N_("The index of the offset corner")); + .description("The index of the offset corner"); } class OffsetCornerInFaceFieldInput final : public bke::MeshFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_vertex_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_vertex_of_corner.cc index fbf4cd0115b..e0f31eb1b70 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_vertex_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_vertex_of_corner.cc @@ -10,13 +10,12 @@ namespace blender::nodes::node_geo_mesh_topology_vertex_of_corner_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Corner Index")) + b.add_input("Corner Index") .implicit_field(implicit_field_inputs::index) - .description( - N_("The corner to retrieve data from. Defaults to the corner from the context")); - b.add_output(N_("Vertex Index")) + .description("The corner to retrieve data from. Defaults to the corner from the context"); + b.add_output("Vertex Index") .field_source_reference_all() - .description(N_("The vertex the corner is attached to")); + .description("The vertex the corner is attached to"); } class CornerVertFieldInput final : public bke::MeshFieldInput { 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 13c189101ca..0b6b26ddfab 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -16,14 +16,15 @@ NODE_STORAGE_FUNCS(NodeGeometryObjectInfo) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Object")).hide_label(); - b.add_input(N_("As Instance")) - .description(N_("Output the entire object as single instance. " - "This allows instancing non-geometry object types")); - b.add_output(N_("Location")); - b.add_output(N_("Rotation")); - b.add_output(N_("Scale")); - b.add_output(N_("Geometry")); + b.add_input("Object").hide_label(); + b.add_input("As Instance") + .description( + "Output the entire object as single instance. " + "This allows instancing non-geometry object types"); + b.add_output("Location"); + b.add_output("Rotation"); + b.add_output("Scale"); + b.add_output("Geometry"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_offset_point_in_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_offset_point_in_curve.cc index 99a58140025..60b3a90ee97 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_offset_point_in_curve.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_offset_point_in_curve.cc @@ -26,21 +26,21 @@ namespace blender::nodes::node_geo_offset_point_in_curve_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Point Index")) + b.add_input("Point Index") .implicit_field(implicit_field_inputs::index) + .description("The index of the control point to evaluate. Defaults to the current index"); + b.add_input("Offset").supports_field().description( + "The number of control points along the curve to traverse"); + b.add_output("Is Valid Offset") + .field_source_reference_all() .description( - N_("The index of the control point to evaluate. Defaults to the current index")); - b.add_input(N_("Offset")) - .supports_field() - .description(N_("The number of control points along the curve to traverse")); - b.add_output(N_("Is Valid Offset")) + "Whether the input control point plus the offset is a valid index of the " + "original curve"); + b.add_output("Point Index") .field_source_reference_all() - .description(N_("Whether the input control point plus the offset is a valid index of the " - "original curve")); - b.add_output(N_("Point Index")) - .field_source_reference_all() - .description(N_("The index of the control point plus the offset within the entire " - "curves data-block")); + .description( + "The index of the control point plus the offset within the entire " + "curves data-block"); } class ControlPointNeighborFieldInput final : public bke::CurvesFieldInput { diff --git a/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc index 2c73889ef12..5f08ddf979f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc @@ -22,12 +22,11 @@ namespace blender::nodes::node_geo_offset_sdf_volume_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) + b.add_input("Volume") .supported_type(GEO_COMPONENT_TYPE_VOLUME) .translation_context(BLT_I18NCONTEXT_ID_ID); - b.add_input(N_("Distance")).default_value(0.1f).subtype(PROP_DISTANCE); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Distance").default_value(0.1f).subtype(PROP_DISTANCE); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void search_node_add_ops(GatherAddNodeSearchParams ¶ms) diff --git a/source/blender/nodes/geometry/nodes/node_geo_points.cc b/source/blender/nodes/geometry/nodes/node_geo_points.cc index 5e374e03e5a..42536f6b54c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points.cc @@ -11,21 +11,21 @@ namespace blender::nodes::node_geo_points_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Count")) + b.add_input("Count") .default_value(1) - .description(N_("The number of points to create")) + .description("The number of points to create") .min(0); - b.add_input(N_("Position")) + b.add_input("Position") .supports_field() .default_value(float3(0.0f)) - .description(N_("The positions of the new points")); - b.add_input(N_("Radius")) + .description("The positions of the new points"); + b.add_input("Radius") .min(0.0f) .default_value(0.1f) .supports_field() .subtype(PROP_DISTANCE) - .description(N_("The radii of the new points")); - b.add_output(N_("Geometry")); + .description("The radii of the new points"); + b.add_output("Geometry"); } class PointsFieldContext : public FieldContext { diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc index a9089f16873..b729e40e445 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc @@ -20,27 +20,26 @@ NODE_STORAGE_FUNCS(NodeGeometryPointsToVolume) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Points")); - b.add_input(N_("Voxel Size")) + b.add_input("Points"); + b.add_input("Voxel Size") .default_value(0.3f) .min(0.01f) .subtype(PROP_DISTANCE) .make_available([](bNode &node) { node_storage(node).resolution_mode = GEO_NODE_POINTS_TO_VOLUME_RESOLUTION_MODE_SIZE; }); - b.add_input(N_("Voxel Amount")) + b.add_input("Voxel Amount") .default_value(64.0f) .min(0.0f) .make_available([](bNode &node) { node_storage(node).resolution_mode = GEO_NODE_POINTS_TO_VOLUME_RESOLUTION_MODE_AMOUNT; }); - b.add_input(N_("Radius")) + b.add_input("Radius") .default_value(0.5f) .min(0.0f) .subtype(PROP_DISTANCE) .field_on_all(); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void search_node_add_ops(GatherAddNodeSearchParams ¶ms) 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 c8c19c8dc59..ae8da54d6f4 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 @@ -15,9 +15,9 @@ using blender::Array; static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Points")).supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); - b.add_input(N_("Selection")).default_value(true).field_on_all().hide_value(); - b.add_output(N_("Mesh")).propagate_all(); + b.add_input("Points").supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); + b.add_input("Selection").default_value(true).field_on_all().hide_value(); + b.add_output("Mesh").propagate_all(); } /* One improvement would be to move the attribute arrays directly to the mesh when possible. */ 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 e6d2c88b2fb..c8900de59a1 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 @@ -141,28 +141,27 @@ NODE_STORAGE_FUNCS(NodeGeometryPointsToVolume) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Points")); - b.add_input(N_("Density")).default_value(1.0f).min(0.0f); - b.add_input(N_("Voxel Size")) + b.add_input("Points"); + b.add_input("Density").default_value(1.0f).min(0.0f); + b.add_input("Voxel Size") .default_value(0.3f) .min(0.01f) .subtype(PROP_DISTANCE) .make_available([](bNode &node) { node_storage(node).resolution_mode = GEO_NODE_POINTS_TO_VOLUME_RESOLUTION_MODE_SIZE; }); - b.add_input(N_("Voxel Amount")) + b.add_input("Voxel Amount") .default_value(64.0f) .min(0.0f) .make_available([](bNode &node) { node_storage(node).resolution_mode = GEO_NODE_POINTS_TO_VOLUME_RESOLUTION_MODE_AMOUNT; }); - b.add_input(N_("Radius")) + b.add_input("Radius") .default_value(0.5f) .min(0.0f) .subtype(PROP_DISTANCE) .field_on_all(); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc index 225c9aa44d4..21b80ba4636 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc @@ -20,12 +20,11 @@ NODE_STORAGE_FUNCS(NodeGeometryProximity) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Target")) - .only_realized_data() - .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); - b.add_input(N_("Source Position")).implicit_field(implicit_field_inputs::position); - b.add_output(N_("Position")).dependent_field().reference_pass_all(); - b.add_output(N_("Distance")).dependent_field().reference_pass_all(); + b.add_input("Target").only_realized_data().supported_type( + {GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); + b.add_input("Source Position").implicit_field(implicit_field_inputs::position); + b.add_output("Position").dependent_field().reference_pass_all(); + b.add_output("Distance").dependent_field().reference_pass_all(); } static void node_layout(uiLayout *layout, bContext * /*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 c9f758cecde..5a5dd6ecf25 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc @@ -23,36 +23,34 @@ NODE_STORAGE_FUNCS(NodeGeometryRaycast) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Target Geometry")) + b.add_input("Target Geometry") .only_realized_data() .supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Attribute")).hide_value().field_on_all(); - b.add_input(N_("Attribute"), "Attribute_001").hide_value().field_on_all(); - b.add_input(N_("Attribute"), "Attribute_002").hide_value().field_on_all(); - b.add_input(N_("Attribute"), "Attribute_003").hide_value().field_on_all(); - b.add_input(N_("Attribute"), "Attribute_004").hide_value().field_on_all(); + b.add_input("Attribute").hide_value().field_on_all(); + b.add_input("Attribute", "Attribute_001").hide_value().field_on_all(); + b.add_input("Attribute", "Attribute_002").hide_value().field_on_all(); + b.add_input("Attribute", "Attribute_003").hide_value().field_on_all(); + b.add_input("Attribute", "Attribute_004").hide_value().field_on_all(); - b.add_input(N_("Source Position")).implicit_field(implicit_field_inputs::position); - b.add_input(N_("Ray Direction")) - .default_value({0.0f, 0.0f, -1.0f}) - .supports_field(); - b.add_input(N_("Ray Length")) + b.add_input("Source Position").implicit_field(implicit_field_inputs::position); + b.add_input("Ray Direction").default_value({0.0f, 0.0f, -1.0f}).supports_field(); + b.add_input("Ray Length") .default_value(100.0f) .min(0.0f) .subtype(PROP_DISTANCE) .supports_field(); - b.add_output(N_("Is Hit")).dependent_field({6, 7, 8}); - b.add_output(N_("Hit Position")).dependent_field({6, 7, 8}); - b.add_output(N_("Hit Normal")).dependent_field({6, 7, 8}); - b.add_output(N_("Hit Distance")).dependent_field({6, 7, 8}); + b.add_output("Is Hit").dependent_field({6, 7, 8}); + b.add_output("Hit Position").dependent_field({6, 7, 8}); + b.add_output("Hit Normal").dependent_field({6, 7, 8}); + b.add_output("Hit Distance").dependent_field({6, 7, 8}); - b.add_output(N_("Attribute")).dependent_field({6, 7, 8}); - b.add_output(N_("Attribute"), "Attribute_001").dependent_field({6, 7, 8}); - b.add_output(N_("Attribute"), "Attribute_002").dependent_field({6, 7, 8}); - b.add_output(N_("Attribute"), "Attribute_003").dependent_field({6, 7, 8}); - b.add_output(N_("Attribute"), "Attribute_004").dependent_field({6, 7, 8}); + b.add_output("Attribute").dependent_field({6, 7, 8}); + b.add_output("Attribute", "Attribute_001").dependent_field({6, 7, 8}); + b.add_output("Attribute", "Attribute_002").dependent_field({6, 7, 8}); + b.add_output("Attribute", "Attribute_003").dependent_field({6, 7, 8}); + b.add_output("Attribute", "Attribute_004").dependent_field({6, 7, 8}); } static void node_layout(uiLayout *layout, bContext * /*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 18311e9ca58..fce242ef753 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc @@ -11,8 +11,8 @@ namespace blender::nodes::node_geo_realize_instances_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry"); + b.add_output("Geometry").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc index 4a72647ba4c..dbf2b54135c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc @@ -8,9 +8,9 @@ namespace blender::nodes::node_geo_remove_attribute_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Name")).is_attribute_name(); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry"); + b.add_input("Name").is_attribute_name(); + b.add_output("Geometry").propagate_all(); } static void node_geo_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 ea1c5ddd17d..c3cadf0349b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc @@ -12,12 +12,12 @@ namespace blender::nodes::node_geo_rotate_instances_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Instances")).only_instances(); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Rotation")).subtype(PROP_EULER).field_on_all(); - b.add_input(N_("Pivot Point")).subtype(PROP_TRANSLATION).field_on_all(); - b.add_input(N_("Local Space")).default_value(true).field_on_all(); - b.add_output(N_("Instances")).propagate_all(); + b.add_input("Instances").only_instances(); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Rotation").subtype(PROP_EULER).field_on_all(); + b.add_input("Pivot Point").subtype(PROP_TRANSLATION).field_on_all(); + b.add_input("Local Space").default_value(true).field_on_all(); + b.add_output("Instances").propagate_all(); } static void rotate_instances(GeoNodeExecParams ¶ms, bke::Instances &instances) diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc index ae0117f63a6..c369fc23a98 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc @@ -54,26 +54,25 @@ NODE_STORAGE_FUNCS(NodeGeometrySampleIndex); static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")) + b.add_input("Geometry") .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_CURVE, GEO_COMPONENT_TYPE_INSTANCES}); - b.add_input(N_("Value"), "Value_Float").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Int").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Vector").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Color").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Bool").hide_value().field_on_all(); - b.add_input(N_("Index")) - .supports_field() - .description(N_("Which element to retrieve a value from on the geometry")); + b.add_input("Value", "Value_Float").hide_value().field_on_all(); + b.add_input("Value", "Value_Int").hide_value().field_on_all(); + b.add_input("Value", "Value_Vector").hide_value().field_on_all(); + b.add_input("Value", "Value_Color").hide_value().field_on_all(); + b.add_input("Value", "Value_Bool").hide_value().field_on_all(); + b.add_input("Index").supports_field().description( + "Which element to retrieve a value from on the geometry"); - b.add_output(N_("Value"), "Value_Float").dependent_field({6}); - b.add_output(N_("Value"), "Value_Int").dependent_field({6}); - b.add_output(N_("Value"), "Value_Vector").dependent_field({6}); - b.add_output(N_("Value"), "Value_Color").dependent_field({6}); - b.add_output(N_("Value"), "Value_Bool").dependent_field({6}); + b.add_output("Value", "Value_Float").dependent_field({6}); + b.add_output("Value", "Value_Int").dependent_field({6}); + b.add_output("Value", "Value_Vector").dependent_field({6}); + b.add_output("Value", "Value_Color").dependent_field({6}); + b.add_output("Value", "Value_Bool").dependent_field({6}); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc index 9453503e80b..f13bec47b1a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc @@ -50,10 +50,10 @@ namespace blender::nodes::node_geo_sample_nearest_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")) + b.add_input("Geometry") .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); - b.add_input(N_("Sample Position")).implicit_field(implicit_field_inputs::position); - b.add_output(N_("Index")).dependent_field({1}); + b.add_input("Sample Position").implicit_field(implicit_field_inputs::position); + b.add_output("Index").dependent_field({1}); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc index 097520f01f6..d4c337b0643 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc @@ -21,21 +21,21 @@ using namespace blender::bke::mesh_surface_sample; static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Value"), "Value_Float").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Int").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Vector").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Color").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Bool").hide_value().field_on_all(); + b.add_input("Value", "Value_Float").hide_value().field_on_all(); + b.add_input("Value", "Value_Int").hide_value().field_on_all(); + b.add_input("Value", "Value_Vector").hide_value().field_on_all(); + b.add_input("Value", "Value_Color").hide_value().field_on_all(); + b.add_input("Value", "Value_Bool").hide_value().field_on_all(); - b.add_input(N_("Sample Position")).implicit_field(implicit_field_inputs::position); + b.add_input("Sample Position").implicit_field(implicit_field_inputs::position); - b.add_output(N_("Value"), "Value_Float").dependent_field({6}); - b.add_output(N_("Value"), "Value_Int").dependent_field({6}); - b.add_output(N_("Value"), "Value_Vector").dependent_field({6}); - b.add_output(N_("Value"), "Value_Color").dependent_field({6}); - b.add_output(N_("Value"), "Value_Bool").dependent_field({6}); + b.add_output("Value", "Value_Float").dependent_field({6}); + b.add_output("Value", "Value_Int").dependent_field({6}); + b.add_output("Value", "Value_Vector").dependent_field({6}); + b.add_output("Value", "Value_Color").dependent_field({6}); + b.add_output("Value", "Value_Bool").dependent_field({6}); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc index 2b2e71356cc..6a0e4da8766 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc @@ -20,31 +20,31 @@ using geometry::ReverseUVSampler; static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Value"), "Value_Float").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Int").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Vector").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Color").hide_value().field_on_all(); - b.add_input(N_("Value"), "Value_Bool").hide_value().field_on_all(); + b.add_input("Value", "Value_Float").hide_value().field_on_all(); + b.add_input("Value", "Value_Int").hide_value().field_on_all(); + b.add_input("Value", "Value_Vector").hide_value().field_on_all(); + b.add_input("Value", "Value_Color").hide_value().field_on_all(); + b.add_input("Value", "Value_Bool").hide_value().field_on_all(); - b.add_input(N_("Source UV Map")) + b.add_input("Source UV Map") .hide_value() .field_on_all() - .description(N_("The mesh UV map to sample. Should not have overlapping faces")); - b.add_input(N_("Sample UV")) + .description("The mesh UV map to sample. Should not have overlapping faces"); + b.add_input("Sample UV") .supports_field() - .description(N_("The coordinates to sample within the UV map")); + .description("The coordinates to sample within the UV map"); - b.add_output(N_("Value"), "Value_Float").dependent_field({7}); - b.add_output(N_("Value"), "Value_Int").dependent_field({7}); - b.add_output(N_("Value"), "Value_Vector").dependent_field({7}); - b.add_output(N_("Value"), "Value_Color").dependent_field({7}); - b.add_output(N_("Value"), "Value_Bool").dependent_field({7}); + b.add_output("Value", "Value_Float").dependent_field({7}); + b.add_output("Value", "Value_Int").dependent_field({7}); + b.add_output("Value", "Value_Vector").dependent_field({7}); + b.add_output("Value", "Value_Color").dependent_field({7}); + b.add_output("Value", "Value_Bool").dependent_field({7}); - b.add_output(N_("Is Valid")) + b.add_output("Is Valid") .dependent_field({7}) - .description(N_("Whether the node could find a single face to sample at the UV coordinate")); + .description("Whether the node could find a single face to sample at the UV coordinate"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc index aa59d1ecd4f..c51ed1c505c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc @@ -21,20 +21,21 @@ namespace blender::nodes::node_geo_scale_elements_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Scale"), "Scale").default_value(1.0f).min(0.0f).field_on_all(); - b.add_input(N_("Center")) + b.add_input("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Scale", "Scale").default_value(1.0f).min(0.0f).field_on_all(); + b.add_input("Center") .subtype(PROP_TRANSLATION) .implicit_field_on_all(implicit_field_inputs::position) - .description(N_("Origin of the scaling for each element. If multiple elements are " - "connected, their center is averaged")); - b.add_input(N_("Axis")) + .description( + "Origin of the scaling for each element. If multiple elements are connected, their " + "center is averaged"); + b.add_input("Axis") .default_value({1.0f, 0.0f, 0.0f}) .field_on_all() - .description(N_("Direction in which to scale the element")) + .description("Direction in which to scale the element") .make_available([](bNode &node) { node.custom2 = GEO_NODE_SCALE_ELEMENTS_SINGLE_AXIS; }); - b.add_output(N_("Geometry")).propagate_all(); + b.add_output("Geometry").propagate_all(); }; static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 d9a176774bd..a02c1ead27f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc @@ -13,12 +13,12 @@ namespace blender::nodes::node_geo_scale_instances_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Instances")).only_instances(); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Scale")).subtype(PROP_XYZ).default_value({1, 1, 1}).field_on_all(); - b.add_input(N_("Center")).subtype(PROP_TRANSLATION).field_on_all(); - b.add_input(N_("Local Space")).default_value(true).field_on_all(); - b.add_output(N_("Instances")).propagate_all(); + b.add_input("Instances").only_instances(); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Scale").subtype(PROP_XYZ).default_value({1, 1, 1}).field_on_all(); + b.add_input("Center").subtype(PROP_TRANSLATION).field_on_all(); + b.add_input("Local Space").default_value(true).field_on_all(); + b.add_output("Instances").propagate_all(); } static void scale_instances(GeoNodeExecParams ¶ms, bke::Instances &instances) diff --git a/source/blender/nodes/geometry/nodes/node_geo_sdf_volume_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_sdf_volume_sphere.cc index 7176a41f46f..0575cec6826 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sdf_volume_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sdf_volume_sphere.cc @@ -18,15 +18,14 @@ namespace blender::nodes::node_geo_sdf_volume_sphere_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Radius")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input(N_("Voxel Size")).default_value(0.2f).min(0.01f).subtype(PROP_DISTANCE); - b.add_input(N_("Half-Band Width")) - .description(N_("Half the width of the narrow band in voxel units")) + b.add_input("Radius").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input("Voxel Size").default_value(0.2f).min(0.01f).subtype(PROP_DISTANCE); + b.add_input("Half-Band Width") + .description("Half the width of the narrow band in voxel units") .default_value(3.0f) .min(1.01f) .max(10.0f); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void search_node_add_ops(GatherAddNodeSearchParams ¶ms) diff --git a/source/blender/nodes/geometry/nodes/node_geo_self_object.cc b/source/blender/nodes/geometry/nodes/node_geo_self_object.cc index 7b33afdb4a0..764dd3d6989 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_self_object.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_self_object.cc @@ -6,7 +6,7 @@ namespace blender::nodes::node_geo_self_object_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Self Object")); + b.add_output("Self Object"); } static void node_geo_exec(GeoNodeExecParams params) 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 f9706cd77c5..06d5509838f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc @@ -6,14 +6,14 @@ namespace blender::nodes::node_geo_separate_components_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_output(N_("Mesh")).propagate_all(); - b.add_output(N_("Curve")).propagate_all(); - b.add_output(N_("Point Cloud")).propagate_all(); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) + b.add_input("Geometry"); + b.add_output("Mesh").propagate_all(); + b.add_output("Curve").propagate_all(); + b.add_output("Point Cloud").propagate_all(); + b.add_output("Volume") .translation_context(BLT_I18NCONTEXT_ID_ID) .propagate_all(); - b.add_output(N_("Instances")).propagate_all(); + b.add_output("Instances").propagate_all(); } static void node_geo_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 28c0bf84160..7874faaaf6a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc @@ -11,18 +11,18 @@ NODE_STORAGE_FUNCS(NodeGeometrySeparateGeometry) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")) + b.add_input("Geometry"); + b.add_input("Selection") .default_value(true) .hide_value() .field_on_all() - .description(N_("The parts of the geometry that go into the first output")); - b.add_output(N_("Selection")) + .description("The parts of the geometry that go into the first output"); + b.add_output("Selection") .propagate_all() - .description(N_("The parts of the geometry in the selection")); - b.add_output(N_("Inverted")) + .description("The parts of the geometry in the selection"); + b.add_output("Inverted") .propagate_all() - .description(N_("The parts of the geometry not in the selection")); + .description("The parts of the geometry not in the selection"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 603c8f3856d..fda70684c84 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 @@ -17,17 +17,17 @@ NODE_STORAGE_FUNCS(NodeGeometrySetCurveHandlePositions) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Position")) + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Position") .implicit_field_on_all([](const bNode &node, void *r_value) { const StringRef side = node_storage(node).mode == GEO_NODE_CURVE_HANDLE_LEFT ? "handle_left" : "handle_right"; new (r_value) ValueOrField(bke::AttributeFieldInput::Create(side)); }); - b.add_input(N_("Offset")).default_value(float3(0.0f, 0.0f, 0.0f)).field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Offset").default_value(float3(0.0f, 0.0f, 0.0f)).field_on_all(); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc index 9ba6c336508..1a54f6576a3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc @@ -11,9 +11,9 @@ namespace blender::nodes::node_geo_set_curve_normal_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_output("Curve").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 5f576abfbdb..749f4c7b836 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 @@ -8,14 +8,11 @@ namespace blender::nodes::node_geo_set_curve_radius_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Radius")) - .min(0.0f) - .default_value(0.005f) - .field_on_all() - .subtype(PROP_DISTANCE); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Radius").min(0.0f).default_value(0.005f).field_on_all().subtype( + PROP_DISTANCE); + b.add_output("Curve").propagate_all(); } static void set_radius(bke::CurvesGeometry &curves, 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 9fe53a35f82..696411286aa 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 @@ -8,10 +8,10 @@ namespace blender::nodes::node_geo_set_curve_tilt_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Tilt")).subtype(PROP_ANGLE).field_on_all(); - b.add_output(N_("Curve")).propagate_all(); + b.add_input("Curve").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Tilt").subtype(PROP_ANGLE).field_on_all(); + b.add_output("Curve").propagate_all(); } static void set_tilt(bke::CurvesGeometry &curves, 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 ea3c7876825..dd787b4c808 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_id.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_id.cc @@ -6,10 +6,10 @@ namespace blender::nodes::node_geo_set_id_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("ID")).implicit_field_on_all(implicit_field_inputs::index); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry"); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("ID").implicit_field_on_all(implicit_field_inputs::index); + b.add_output("Geometry").propagate_all(); } 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 027f695d0e9..a0b06f8e9b5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc @@ -18,14 +18,14 @@ namespace blender::nodes::node_geo_set_material_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")) + b.add_input("Geometry") .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_VOLUME, GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_CURVE}); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Material")).hide_label(); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Material").hide_label(); + b.add_output("Geometry").propagate_all(); } 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 ea55d9fd695..118363437d1 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 @@ -6,10 +6,10 @@ namespace blender::nodes::node_geo_set_material_index_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Material Index")).field_on_all().min(0); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Material Index").field_on_all().min(0); + b.add_output("Geometry").propagate_all(); } 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 43b62c8e78f..f8abb4fae32 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 @@ -8,14 +8,11 @@ namespace blender::nodes::node_geo_set_point_radius_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Points")).supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Radius")) - .default_value(0.05f) - .min(0.0f) - .field_on_all() - .subtype(PROP_DISTANCE); - b.add_output(N_("Points")).propagate_all(); + b.add_input("Points").supported_type(GEO_COMPONENT_TYPE_POINT_CLOUD); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Radius").default_value(0.05f).min(0.0f).field_on_all().subtype( + PROP_DISTANCE); + b.add_output("Points").propagate_all(); } static void set_radius_in_component(PointCloud &pointcloud, 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 595f87cfa0b..362d59ea6c9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc @@ -16,11 +16,11 @@ namespace blender::nodes::node_geo_set_position_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Position")).implicit_field_on_all(implicit_field_inputs::position); - b.add_input(N_("Offset")).field_on_all().subtype(PROP_TRANSLATION); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry"); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Position").implicit_field_on_all(implicit_field_inputs::position); + b.add_input("Offset").field_on_all().subtype(PROP_TRANSLATION); + b.add_output("Geometry").propagate_all(); } static void set_computed_position_and_offset(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 62ea79728c2..933eaf21b88 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 @@ -8,10 +8,10 @@ namespace blender::nodes::node_geo_set_shade_smooth_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Shade Smooth")).field_on_all().default_value(true); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Shade Smooth").field_on_all().default_value(true); + b.add_output("Geometry").propagate_all(); } /** 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 8ef4f76ba8d..257f1df51e4 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 @@ -8,10 +8,10 @@ namespace blender::nodes::node_geo_set_spline_cyclic_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Cyclic")).field_on_all(); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Cyclic").field_on_all(); + b.add_output("Geometry").propagate_all(); } static void set_cyclic(bke::CurvesGeometry &curves, 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 0c0db94b561..cfedcfdaba1 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 @@ -8,10 +8,10 @@ namespace blender::nodes::node_geo_set_spline_resolution_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")).supported_type(GEO_COMPONENT_TYPE_CURVE); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Resolution")).min(1).default_value(12).field_on_all(); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry").supported_type(GEO_COMPONENT_TYPE_CURVE); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Resolution").min(1).default_value(12).field_on_all(); + b.add_output("Geometry").propagate_all(); } static void set_resolution(bke::CurvesGeometry &curves, diff --git a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc index 61a4637fcf9..6330692289e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc @@ -19,16 +19,16 @@ NODE_STORAGE_FUNCS(NodeGeometryStoreNamedAttribute) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Name")).is_attribute_name(); - b.add_input(N_("Value"), "Value_Vector").field_on_all(); - b.add_input(N_("Value"), "Value_Float").field_on_all(); - b.add_input(N_("Value"), "Value_Color").field_on_all(); - b.add_input(N_("Value"), "Value_Bool").field_on_all(); - b.add_input(N_("Value"), "Value_Int").field_on_all(); + b.add_input("Geometry"); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Name").is_attribute_name(); + b.add_input("Value", "Value_Vector").field_on_all(); + b.add_input("Value", "Value_Float").field_on_all(); + b.add_input("Value", "Value_Color").field_on_all(); + b.add_input("Value", "Value_Bool").field_on_all(); + b.add_input("Value", "Value_Int").field_on_all(); - b.add_output(N_("Geometry")).propagate_all(); + b.add_output("Geometry").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 09c01b8c627..ada20f70dbe 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_join.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_join.cc @@ -6,9 +6,9 @@ namespace blender::nodes::node_geo_string_join_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Delimiter")); - b.add_input(N_("Strings")).multi_input().hide_value(); - b.add_output(N_("String")); + b.add_input("Delimiter"); + b.add_input("Strings").multi_input().hide_value(); + b.add_output("String"); } static void node_geo_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 f88ef1da302..a2eee9f55e3 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 @@ -26,28 +26,25 @@ NODE_STORAGE_FUNCS(NodeGeometryStringToCurves) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("String")); - b.add_input(N_("Size")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); - b.add_input(N_("Character Spacing")).default_value(1.0f).min(0.0f); - b.add_input(N_("Word Spacing")).default_value(1.0f).min(0.0f); - b.add_input(N_("Line Spacing")).default_value(1.0f).min(0.0f); - b.add_input(N_("Text Box Width")) - .default_value(0.0f) - .min(0.0f) - .subtype(PROP_DISTANCE); - b.add_input(N_("Text Box Height")) + b.add_input("String"); + b.add_input("Size").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input("Character Spacing").default_value(1.0f).min(0.0f); + b.add_input("Word Spacing").default_value(1.0f).min(0.0f); + b.add_input("Line Spacing").default_value(1.0f).min(0.0f); + b.add_input("Text Box Width").default_value(0.0f).min(0.0f).subtype(PROP_DISTANCE); + b.add_input("Text Box Height") .default_value(0.0f) .min(0.0f) .subtype(PROP_DISTANCE) .make_available([](bNode &node) { node_storage(node).overflow = GEO_NODE_STRING_TO_CURVES_MODE_SCALE_TO_FIT; }); - b.add_output(N_("Curve Instances")); - b.add_output(N_("Remainder")).make_available([](bNode &node) { + b.add_output("Curve Instances"); + b.add_output("Remainder").make_available([](bNode &node) { node_storage(node).overflow = GEO_NODE_STRING_TO_CURVES_MODE_TRUNCATE; }); - b.add_output(N_("Line")).field_on_all(); - b.add_output(N_("Pivot Point")).field_on_all(); + b.add_output("Line").field_on_all(); + b.add_output("Pivot Point").field_on_all(); } static void node_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 0dae3c0c3d8..0186d20fac0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -22,21 +22,21 @@ NODE_STORAGE_FUNCS(NodeGeometrySubdivisionSurface) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Level")).default_value(1).min(0).max(6); - b.add_input(N_("Edge Crease")) + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Level").default_value(1).min(0).max(6); + b.add_input("Edge Crease") .default_value(0.0f) .min(0.0f) .max(1.0f) .field_on_all() .subtype(PROP_FACTOR); - b.add_input(N_("Vertex Crease")) + b.add_input("Vertex Crease") .default_value(0.0f) .min(0.0f) .max(1.0f) .field_on_all() .subtype(PROP_FACTOR); - b.add_output(N_("Mesh")).propagate_all(); + b.add_output("Mesh").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_switch.cc index 8f6a03a0234..6fcbb6ad5dc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_switch.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_switch.cc @@ -15,57 +15,52 @@ NODE_STORAGE_FUNCS(NodeSwitch) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Switch")).default_value(false).supports_field(); - b.add_input(N_("Switch"), "Switch_001").default_value(false); + b.add_input("Switch").default_value(false).supports_field(); + b.add_input("Switch", "Switch_001").default_value(false); - b.add_input(N_("False")).supports_field(); - b.add_input(N_("True")).supports_field(); - b.add_input(N_("False"), "False_001").min(-100000).max(100000).supports_field(); - b.add_input(N_("True"), "True_001").min(-100000).max(100000).supports_field(); - b.add_input(N_("False"), "False_002") - .default_value(false) - .hide_value() - .supports_field(); - b.add_input(N_("True"), "True_002") - .default_value(true) - .hide_value() - .supports_field(); - b.add_input(N_("False"), "False_003").supports_field(); - b.add_input(N_("True"), "True_003").supports_field(); - b.add_input(N_("False"), "False_004") + b.add_input("False").supports_field(); + b.add_input("True").supports_field(); + b.add_input("False", "False_001").min(-100000).max(100000).supports_field(); + b.add_input("True", "True_001").min(-100000).max(100000).supports_field(); + b.add_input("False", "False_002").default_value(false).hide_value().supports_field(); + b.add_input("True", "True_002").default_value(true).hide_value().supports_field(); + b.add_input("False", "False_003").supports_field(); + b.add_input("True", "True_003").supports_field(); + + b.add_input("False", "False_004") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .supports_field(); - b.add_input(N_("True"), "True_004") + b.add_input("True", "True_004") .default_value({0.8f, 0.8f, 0.8f, 1.0f}) .supports_field(); - b.add_input(N_("False"), "False_005").supports_field(); - b.add_input(N_("True"), "True_005").supports_field(); + b.add_input("False", "False_005").supports_field(); + b.add_input("True", "True_005").supports_field(); - b.add_input(N_("False"), "False_006"); - b.add_input(N_("True"), "True_006"); - b.add_input(N_("False"), "False_007"); - b.add_input(N_("True"), "True_007"); - b.add_input(N_("False"), "False_008"); - b.add_input(N_("True"), "True_008"); - b.add_input(N_("False"), "False_009"); - b.add_input(N_("True"), "True_009"); - b.add_input(N_("False"), "False_010"); - b.add_input(N_("True"), "True_010"); - b.add_input(N_("False"), "False_011"); - b.add_input(N_("True"), "True_011"); + b.add_input("False", "False_006"); + b.add_input("True", "True_006"); + b.add_input("False", "False_007"); + b.add_input("True", "True_007"); + b.add_input("False", "False_008"); + b.add_input("True", "True_008"); + b.add_input("False", "False_009"); + b.add_input("True", "True_009"); + b.add_input("False", "False_010"); + b.add_input("True", "True_010"); + b.add_input("False", "False_011"); + b.add_input("True", "True_011"); - b.add_output(N_("Output")).dependent_field().reference_pass_all(); - b.add_output(N_("Output"), "Output_001").dependent_field().reference_pass_all(); - b.add_output(N_("Output"), "Output_002").dependent_field().reference_pass_all(); - b.add_output(N_("Output"), "Output_003").dependent_field().reference_pass_all(); - b.add_output(N_("Output"), "Output_004").dependent_field().reference_pass_all(); - b.add_output(N_("Output"), "Output_005").dependent_field().reference_pass_all(); - b.add_output(N_("Output"), "Output_006").propagate_all(); - b.add_output(N_("Output"), "Output_007"); - b.add_output(N_("Output"), "Output_008"); - b.add_output(N_("Output"), "Output_009"); - b.add_output(N_("Output"), "Output_010"); - b.add_output(N_("Output"), "Output_011"); + b.add_output("Output").dependent_field().reference_pass_all(); + b.add_output("Output", "Output_001").dependent_field().reference_pass_all(); + b.add_output("Output", "Output_002").dependent_field().reference_pass_all(); + b.add_output("Output", "Output_003").dependent_field().reference_pass_all(); + b.add_output("Output", "Output_004").dependent_field().reference_pass_all(); + b.add_output("Output", "Output_005").dependent_field().reference_pass_all(); + b.add_output("Output", "Output_006").propagate_all(); + b.add_output("Output", "Output_007"); + b.add_output("Output", "Output_008"); + b.add_output("Output", "Output_009"); + b.add_output("Output", "Output_010"); + b.add_output("Output", "Output_011"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc index b4816379ebb..f17819cb04d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc @@ -263,11 +263,11 @@ namespace blender::nodes::node_geo_transform_geometry_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Translation")).subtype(PROP_TRANSLATION); - b.add_input(N_("Rotation")).subtype(PROP_EULER); - b.add_input(N_("Scale")).default_value({1, 1, 1}).subtype(PROP_XYZ); - b.add_output(N_("Geometry")).propagate_all(); + b.add_input("Geometry"); + b.add_input("Translation").subtype(PROP_TRANSLATION); + b.add_input("Rotation").subtype(PROP_EULER); + b.add_input("Scale").default_value({1, 1, 1}).subtype(PROP_XYZ); + b.add_output("Geometry").propagate_all(); } static void node_geo_exec(GeoNodeExecParams params) 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 fffdaf487d3..40863795704 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc @@ -12,11 +12,11 @@ namespace blender::nodes::node_geo_translate_instances_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Instances")).only_instances(); - b.add_input(N_("Selection")).default_value(true).hide_value().field_on_all(); - b.add_input(N_("Translation")).subtype(PROP_TRANSLATION).field_on_all(); - b.add_input(N_("Local Space")).default_value(true).field_on_all(); - b.add_output(N_("Instances")).propagate_all(); + b.add_input("Instances").only_instances(); + b.add_input("Selection").default_value(true).hide_value().field_on_all(); + b.add_input("Translation").subtype(PROP_TRANSLATION).field_on_all(); + b.add_input("Local Space").default_value(true).field_on_all(); + b.add_output("Instances").propagate_all(); } static void translate_instances(GeoNodeExecParams ¶ms, bke::Instances &instances) diff --git a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc index cb1415a9b34..b8e5b9b46fa 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc @@ -17,10 +17,10 @@ namespace blender::nodes::node_geo_triangulate_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Mesh")).supported_type(GEO_COMPONENT_TYPE_MESH); - b.add_input(N_("Selection")).default_value(true).field_on_all().hide_value(); - b.add_input(N_("Minimum Vertices")).default_value(4).min(4).max(10000); - b.add_output(N_("Mesh")).propagate_all(); + b.add_input("Mesh").supported_type(GEO_COMPONENT_TYPE_MESH); + b.add_input("Selection").default_value(true).field_on_all().hide_value(); + b.add_input("Minimum Vertices").default_value(4).min(4).max(10000); + b.add_output("Mesh").propagate_all(); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc index 3a294e4ae93..fdf538d36c5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc @@ -13,21 +13,16 @@ namespace blender::nodes::node_geo_uv_pack_islands_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("UV")).hide_value().supports_field(); - b.add_input(N_("Selection")) + b.add_input("UV").hide_value().supports_field(); + b.add_input("Selection") .default_value(true) .hide_value() .supports_field() - .description(N_("Faces to consider when packing islands")); - b.add_input(N_("Margin")) - .default_value(0.001f) - .min(0.0f) - .max(1.0f) - .description(N_("Space between islands")); - b.add_input(N_("Rotate")) - .default_value(true) - .description(N_("Rotate islands for best fit")); - b.add_output(N_("UV")).field_source_reference_all(); + .description("Faces to consider when packing islands"); + b.add_input("Margin").default_value(0.001f).min(0.0f).max(1.0f).description( + "Space between islands"); + b.add_input("Rotate").default_value(true).description("Rotate islands for best fit"); + b.add_output("UV").field_source_reference_all(); } static VArray construct_uv_gvarray(const Mesh &mesh, diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc index 66a6a6e5893..ffa67b48b36 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc @@ -18,26 +18,22 @@ NODE_STORAGE_FUNCS(NodeGeometryUVUnwrap) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Selection")) + b.add_input("Selection") .default_value(true) .hide_value() .supports_field() - .description(N_("Faces to participate in the unwrap operation")); - b.add_input(N_("Seam")) - .hide_value() - .supports_field() - .description(N_("Edges to mark where the mesh is \"cut\" for the purposes of unwrapping")); - b.add_input(N_("Margin")) - .default_value(0.001f) - .min(0.0f) - .max(1.0f) - .description(N_("Space between islands")); - b.add_input(N_("Fill Holes")) + .description("Faces to participate in the unwrap operation"); + b.add_input("Seam").hide_value().supports_field().description( + "Edges to mark where the mesh is \"cut\" for the purposes of unwrapping"); + b.add_input("Margin").default_value(0.001f).min(0.0f).max(1.0f).description( + "Space between islands"); + b.add_input("Fill Holes") .default_value(true) - .description(N_("Virtually fill holes in mesh before unwrapping, to better avoid overlaps " - "and preserve symmetry")); - b.add_output(N_("UV")).field_source_reference_all().description( - N_("UV coordinates between 0 and 1 for each face corner in the selected faces")); + .description( + "Virtually fill holes in mesh before unwrapping, to better avoid overlaps " + "and preserve symmetry"); + b.add_output("UV").field_source_reference_all().description( + "UV coordinates between 0 and 1 for each face corner in the selected faces"); } static void node_layout(uiLayout *layout, bContext * /*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 6335433622c..db1e0e30efc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc @@ -18,12 +18,12 @@ NODE_STORAGE_FUNCS(NodeGeometryViewer) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Geometry")); - b.add_input(N_("Value")).field_on_all().hide_value(); - b.add_input(N_("Value"), "Value_001").field_on_all().hide_value(); - b.add_input(N_("Value"), "Value_002").field_on_all().hide_value(); - b.add_input(N_("Value"), "Value_003").field_on_all().hide_value(); - b.add_input(N_("Value"), "Value_004").field_on_all().hide_value(); + b.add_input("Geometry"); + b.add_input("Value").field_on_all().hide_value(); + b.add_input("Value", "Value_001").field_on_all().hide_value(); + b.add_input("Value", "Value_002").field_on_all().hide_value(); + b.add_input("Value", "Value_003").field_on_all().hide_value(); + b.add_input("Value", "Value_004").field_on_all().hide_value(); } static void node_init(bNodeTree * /*tree*/, bNode *node) diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc index 820f9759a17..eacec9ace2f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc @@ -22,35 +22,33 @@ namespace blender::nodes::node_geo_volume_cube_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Density")) - .description(N_("Volume density per voxel")) + b.add_input("Density") + .description("Volume density per voxel") .supports_field() .default_value(1.0f); - b.add_input(N_("Background")) - .description(N_("Value for voxels outside of the cube")); + b.add_input("Background").description("Value for voxels outside of the cube"); - b.add_input(N_("Min")) - .description(N_("Minimum boundary of volume")) + b.add_input("Min") + .description("Minimum boundary of volume") .default_value(float3(-1.0f)); - b.add_input(N_("Max")) - .description(N_("Maximum boundary of volume")) + b.add_input("Max") + .description("Maximum boundary of volume") .default_value(float3(1.0f)); - b.add_input(N_("Resolution X")) - .description(N_("Number of voxels in the X axis")) + b.add_input("Resolution X") + .description("Number of voxels in the X axis") .default_value(32) .min(2); - b.add_input(N_("Resolution Y")) - .description(N_("Number of voxels in the Y axis")) + b.add_input("Resolution Y") + .description("Number of voxels in the Y axis") .default_value(32) .min(2); - b.add_input(N_("Resolution Z")) - .description(N_("Number of voxels in the Z axis")) + b.add_input("Resolution Z") + .description("Number of voxels in the Z axis") .default_value(32) .min(2); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static float map(const float x, 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 7db90a027ce..497658e1325 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 @@ -27,27 +27,27 @@ NODE_STORAGE_FUNCS(NodeGeometryVolumeToMesh) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) + b.add_input("Volume") .translation_context(BLT_I18NCONTEXT_ID_ID) .supported_type(GEO_COMPONENT_TYPE_VOLUME); - b.add_input(N_("Voxel Size")) + b.add_input("Voxel Size") .default_value(0.3f) .min(0.01f) .subtype(PROP_DISTANCE) .make_available([](bNode &node) { node_storage(node).resolution_mode = VOLUME_TO_MESH_RESOLUTION_MODE_VOXEL_SIZE; }); - b.add_input(N_("Voxel Amount")) + b.add_input("Voxel Amount") .default_value(64.0f) .min(0.0f) .make_available([](bNode &node) { node_storage(node).resolution_mode = VOLUME_TO_MESH_RESOLUTION_MODE_VOXEL_AMOUNT; }); - b.add_input(N_("Threshold")) + b.add_input("Threshold") .default_value(0.1f) - .description(N_("Values larger than the threshold are inside the generated mesh")); - b.add_input(N_("Adaptivity")).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output(N_("Mesh")); + .description("Values larger than the threshold are inside the generated mesh"); + b.add_input("Adaptivity").min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output("Mesh"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc index 453773bdd15..5207197e4f8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc +++ b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc @@ -7,9 +7,9 @@ namespace blender::nodes::node_shader_add_shader_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Shader")); - b.add_input(N_("Shader"), "Shader_001"); - b.add_output(N_("Shader")); + b.add_input("Shader"); + b.add_input("Shader", "Shader_001"); + b.add_output("Shader"); } static int node_shader_gpu_add_shader(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc index fc27e5a8987..e9e37e19355 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc +++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc @@ -10,11 +10,11 @@ namespace blender::nodes::node_shader_ambient_occlusion_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Distance")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Normal")).min(-1.0f).max(1.0f).hide_value(); - b.add_output(N_("Color")); - b.add_output(N_("AO")); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Distance").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Normal").min(-1.0f).max(1.0f).hide_value(); + b.add_output("Color"); + b.add_output("AO"); } static void node_shader_buts_ambient_occlusion(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.cc b/source/blender/nodes/shader/nodes/node_shader_attribute.cc index cfa0557da1d..a5c4a7baa43 100644 --- a/source/blender/nodes/shader/nodes/node_shader_attribute.cc +++ b/source/blender/nodes/shader/nodes/node_shader_attribute.cc @@ -10,10 +10,10 @@ namespace blender::nodes::node_shader_attribute_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Color")); - b.add_output(N_("Vector")); - b.add_output(N_("Fac")); - b.add_output(N_("Alpha")); + b.add_output("Color"); + b.add_output("Vector"); + b.add_output("Fac"); + b.add_output("Alpha"); } static void node_shader_buts_attribute(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_background.cc b/source/blender/nodes/shader/nodes/node_shader_background.cc index b360f585c89..f616b1c9683 100644 --- a/source/blender/nodes/shader/nodes/node_shader_background.cc +++ b/source/blender/nodes/shader/nodes/node_shader_background.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_background_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Strength")).default_value(1.0f).min(0.0f).max(1000000.0f); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("Background")); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Strength").default_value(1.0f).min(0.0f).max(1000000.0f); + b.add_input("Weight").unavailable(); + b.add_output("Background"); } static int node_shader_gpu_background(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_bevel.cc b/source/blender/nodes/shader/nodes/node_shader_bevel.cc index af3027bafe7..7eb298353cf 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bevel.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bevel.cc @@ -10,9 +10,9 @@ namespace blender::nodes::node_shader_bevel_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Radius")).default_value(0.05f).min(0.0f).max(1000.0f); - b.add_input(N_("Normal")).hide_value(); - b.add_output(N_("Normal")); + b.add_input("Radius").default_value(0.05f).min(0.0f).max(1000.0f); + b.add_input("Normal").hide_value(); + b.add_output("Normal"); } static void node_shader_buts_bevel(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_blackbody.cc b/source/blender/nodes/shader/nodes/node_shader_blackbody.cc index 1dfc5ce09de..dd0d974a552 100644 --- a/source/blender/nodes/shader/nodes/node_shader_blackbody.cc +++ b/source/blender/nodes/shader/nodes/node_shader_blackbody.cc @@ -9,8 +9,8 @@ namespace blender::nodes::node_shader_blackbody_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Temperature")).default_value(1500.0f).min(800.0f).max(12000.0f); - b.add_output(N_("Color")); + b.add_input("Temperature").default_value(1500.0f).min(800.0f).max(12000.0f); + b.add_output("Color"); } static int node_shader_gpu_blackbody(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_brightness.cc b/source/blender/nodes/shader/nodes/node_shader_brightness.cc index d9410e028cc..f8ff0bb678e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_brightness.cc +++ b/source/blender/nodes/shader/nodes/node_shader_brightness.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_brightness_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Bright")).default_value(0.0f).min(-100.0f).max(100.0f); - b.add_input(N_("Contrast")).default_value(0.0f).min(-100.0f).max(100.0f); - b.add_output(N_("Color")); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Bright").default_value(0.0f).min(-100.0f).max(100.0f); + b.add_input("Contrast").default_value(0.0f).min(-100.0f).max(100.0f); + b.add_output("Color"); } static int gpu_shader_brightcontrast(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc index 0d94bfb6d80..d668f3dd0c1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc @@ -10,22 +10,22 @@ namespace blender::nodes::node_shader_bsdf_anisotropic_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Roughness")) + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Roughness") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Anisotropy")).default_value(0.5f).min(-1.0f).max(1.0f); - b.add_input(N_("Rotation")) + b.add_input("Anisotropy").default_value(0.5f).min(-1.0f).max(1.0f); + b.add_input("Rotation") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Tangent")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Normal").hide_value(); + b.add_input("Tangent").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_buts_anisotropic(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc index 13d89e76a17..7b1a945eed6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc @@ -7,15 +7,15 @@ namespace blender::nodes::node_shader_bsdf_diffuse_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Roughness")) + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Roughness") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static int node_shader_gpu_bsdf_diffuse(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc index ef949a0e295..1390696c015 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc @@ -7,16 +7,16 @@ namespace blender::nodes::node_shader_bsdf_glass_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Roughness")) + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Roughness") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("IOR")).default_value(1.45f).min(0.0f).max(1000.0f); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("IOR").default_value(1.45f).min(0.0f).max(1000.0f); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_init_glass(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc index 9a25c326988..d4c8baf2577 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc @@ -7,15 +7,15 @@ namespace blender::nodes::node_shader_bsdf_glossy_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Roughness")) + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Roughness") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_init_glossy(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc index 806a3ae15c0..b934a1f8094 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc @@ -10,25 +10,22 @@ namespace blender::nodes::node_shader_bsdf_hair_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Offset")) - .default_value(0.0f) - .min(-M_PI_2) - .max(M_PI_2) - .subtype(PROP_ANGLE); - b.add_input(N_("RoughnessU")) + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Offset").default_value(0.0f).min(-M_PI_2).max(M_PI_2).subtype( + PROP_ANGLE); + b.add_input("RoughnessU") .default_value(0.1f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("RoughnessV")) + b.add_input("RoughnessV") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Tangent")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Tangent").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_buts_hair(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc index d168f410072..dc31686c23f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc @@ -11,56 +11,48 @@ namespace blender::nodes::node_shader_bsdf_hair_principled_cc { /* Color, melanin and absorption coefficient default to approximately same brownish hair. */ static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.017513f, 0.005763f, 0.002059f, 1.0f}); - b.add_input(N_("Melanin")) - .default_value(0.8f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Melanin Redness")) + b.add_input("Color").default_value({0.017513f, 0.005763f, 0.002059f, 1.0f}); + b.add_input("Melanin").default_value(0.8f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Melanin Redness") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Tint")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Absorption Coefficient")) + b.add_input("Tint").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Absorption Coefficient") .default_value({0.245531f, 0.52f, 1.365f}) .min(0.0f) .max(1000.0f); - b.add_input(N_("Roughness")) + b.add_input("Roughness") .default_value(0.3f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Radial Roughness")) + b.add_input("Radial Roughness") .default_value(0.3f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Coat")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("IOR")).default_value(1.55f).min(0.0f).max(1000.0f); - b.add_input(N_("Offset")) + b.add_input("Coat").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("IOR").default_value(1.55f).min(0.0f).max(1000.0f); + b.add_input("Offset") .default_value(2.0f * float(M_PI) / 180.0f) .min(-M_PI_2) .max(M_PI_2) .subtype(PROP_ANGLE); - b.add_input(N_("Random Color")) + b.add_input("Random Color") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Random Roughness")) + b.add_input("Random Roughness") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Random")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Random").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_buts_principled_hair(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc index dcd4f6141ea..bc9a3445650 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc @@ -12,101 +12,93 @@ namespace blender::nodes::node_shader_bsdf_principled_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Base Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Subsurface")) + b.add_input("Base Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Subsurface") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Subsurface Radius")) + b.add_input("Subsurface Radius") .default_value({1.0f, 0.2f, 0.1f}) .min(0.0f) .max(100.0f) .compact(); - b.add_input(N_("Subsurface Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Subsurface IOR")) + b.add_input("Subsurface Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Subsurface IOR") .default_value(1.4f) .min(1.01f) .max(3.8f) .subtype(PROP_FACTOR); - b.add_input(N_("Subsurface Anisotropy")) + b.add_input("Subsurface Anisotropy") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Metallic")) + b.add_input("Metallic") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Specular")) + b.add_input("Specular") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Specular Tint")) + b.add_input("Specular Tint") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Roughness")) + b.add_input("Roughness") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Anisotropic")) + b.add_input("Anisotropic") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Anisotropic Rotation")) + b.add_input("Anisotropic Rotation") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Sheen")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Sheen Tint")) + b.add_input("Sheen").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Sheen Tint") .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Clearcoat")) + b.add_input("Clearcoat") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Clearcoat Roughness")) + b.add_input("Clearcoat Roughness") .default_value(0.03f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("IOR")).default_value(1.45f).min(0.0f).max(1000.0f); - b.add_input(N_("Transmission")) + b.add_input("IOR").default_value(1.45f).min(0.0f).max(1000.0f); + b.add_input("Transmission") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Transmission Roughness")) + b.add_input("Transmission Roughness") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Emission")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("Emission Strength")).default_value(1.0).min(0.0f).max(1000000.0f); - b.add_input(N_("Alpha")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Clearcoat Normal")).hide_value(); - b.add_input(N_("Tangent")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Emission").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("Emission Strength").default_value(1.0).min(0.0f).max(1000000.0f); + b.add_input("Alpha").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Normal").hide_value(); + b.add_input("Clearcoat Normal").hide_value(); + b.add_input("Tangent").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_buts_principled(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc index 368553ad7b7..459f2abace8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc @@ -7,16 +7,16 @@ namespace blender::nodes::node_shader_bsdf_refraction_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Roughness")) + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Roughness") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("IOR")).default_value(1.45f).min(0.0f).max(1000.0f); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("IOR").default_value(1.45f).min(0.0f).max(1000.0f); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_init_refraction(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc index 51847e43b46..b7955e5fd16 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc @@ -10,20 +10,12 @@ namespace blender::nodes::node_shader_bsdf_toon_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Size")) - .default_value(0.5f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Smooth")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Size").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Smooth").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static void node_shader_buts_toon(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc index 2d5ea718e11..499cf059059 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_bsdf_translucent_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static int node_shader_gpu_bsdf_translucent(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc index 9eb11a66ef7..b03bc1e4de1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc @@ -7,9 +7,9 @@ namespace blender::nodes::node_shader_bsdf_transparent_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static int node_shader_gpu_bsdf_transparent(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc index 2df2de229db..0d4c613a30e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc @@ -7,15 +7,11 @@ namespace blender::nodes::node_shader_bsdf_velvet_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Sigma")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Sigma").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } static int node_shader_gpu_bsdf_velvet(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_bump.cc b/source/blender/nodes/shader/nodes/node_shader_bump.cc index 8a2368a61bf..5efc190d93a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bump.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bump.cc @@ -16,19 +16,15 @@ namespace blender::nodes::node_shader_bump_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Strength")) + b.add_input("Strength") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Distance")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Height")) - .default_value(1.0f) - .min(-1000.0f) - .max(1000.0f) - .hide_value(); - b.add_input(N_("Normal")).min(-1.0f).max(1.0f).hide_value(); - b.add_output(N_("Normal")); + b.add_input("Distance").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Height").default_value(1.0f).min(-1000.0f).max(1000.0f).hide_value(); + b.add_input("Normal").min(-1.0f).max(1.0f).hide_value(); + b.add_output("Normal"); } static void node_shader_buts_bump(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_camera.cc b/source/blender/nodes/shader/nodes/node_shader_camera.cc index bfa5e6212ab..d8cc4fde96d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_camera.cc +++ b/source/blender/nodes/shader/nodes/node_shader_camera.cc @@ -11,9 +11,9 @@ namespace blender::nodes::node_shader_camera_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("View Vector")); - b.add_output(N_("View Z Depth")); - b.add_output(N_("View Distance")); + b.add_output("View Vector"); + b.add_output("View Z Depth"); + b.add_output("View Distance"); } static int gpu_shader_camera(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc index f3506bebbde..c42f0e7f7b1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc @@ -15,10 +15,10 @@ namespace blender::nodes::node_shader_clamp_cc { static void sh_node_clamp_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Value")).default_value(1.0f); - b.add_input(N_("Min")).default_value(0.0f).min(-10000.0f).max(10000.0f); - b.add_input(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f); - b.add_output(N_("Result")); + b.add_input("Value").default_value(1.0f); + b.add_input("Min").default_value(0.0f).min(-10000.0f).max(10000.0f); + b.add_input("Max").default_value(1.0f).min(-10000.0f).max(10000.0f); + b.add_output("Result"); } static void node_shader_buts_clamp(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc index 2138c44d71b..b6d5c87ad3a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc @@ -16,9 +16,9 @@ namespace blender::nodes::node_shader_color_ramp_cc { static void sh_node_valtorgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_output(N_("Color")); - b.add_output(N_("Alpha")); + b.add_input("Fac").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output("Color"); + b.add_output("Alpha"); } static void node_shader_init_valtorgb(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc index 537ec289d5e..e9ac07e84b5 100644 --- a/source/blender/nodes/shader/nodes/node_shader_curves.cc +++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc @@ -12,14 +12,10 @@ namespace blender::nodes::node_shader_curves_cc { static void sh_node_curve_vec_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Fac")) - .no_muted_links() - .min(0.0f) - .max(1.0f) - .default_value(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Vector")).min(-1.0f).max(1.0f); - b.add_output(N_("Vector")); + b.add_input("Fac").no_muted_links().min(0.0f).max(1.0f).default_value(1.0f).subtype( + PROP_FACTOR); + b.add_input("Vector").min(-1.0f).max(1.0f); + b.add_output("Vector"); } static void node_shader_init_curve_vec(bNodeTree * /*ntree*/, bNode *node) @@ -130,14 +126,10 @@ namespace blender::nodes::node_shader_curves_cc { static void sh_node_curve_rgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Fac")) - .no_muted_links() - .min(0.0f) - .max(1.0f) - .default_value(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_output(N_("Color")); + b.add_input("Fac").no_muted_links().min(0.0f).max(1.0f).default_value(1.0f).subtype( + PROP_FACTOR); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_output("Color"); } static void node_shader_init_curve_rgb(bNodeTree * /*ntree*/, bNode *node) @@ -276,14 +268,14 @@ namespace blender::nodes::node_shader_curves_cc { static void sh_node_curve_float_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Factor")) + b.add_input("Factor") .no_muted_links() .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Value")).default_value(1.0f).is_default_link_socket(); - b.add_output(N_("Value")); + b.add_input("Value").default_value(1.0f).is_default_link_socket(); + b.add_output("Value"); } static void node_shader_init_curve_float(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_displacement.cc b/source/blender/nodes/shader/nodes/node_shader_displacement.cc index 4b283b049df..d84531c9880 100644 --- a/source/blender/nodes/shader/nodes/node_shader_displacement.cc +++ b/source/blender/nodes/shader/nodes/node_shader_displacement.cc @@ -7,11 +7,11 @@ namespace blender::nodes::node_shader_displacement_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Height")).default_value(0.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Midlevel")).default_value(0.5f).min(0.0f).max(1000.0f); - b.add_input(N_("Scale")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Normal")).hide_value(); - b.add_output(N_("Displacement")); + b.add_input("Height").default_value(0.0f).min(0.0f).max(1000.0f); + b.add_input("Midlevel").default_value(0.5f).min(0.0f).max(1000.0f); + b.add_input("Scale").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Normal").hide_value(); + b.add_output("Displacement"); } static void node_shader_init_displacement(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc index 67b9a873a49..7a7a7419348 100644 --- a/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc +++ b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc @@ -7,34 +7,34 @@ namespace blender::nodes::node_shader_eevee_specular_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Base Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Specular")).default_value({0.03f, 0.03f, 0.03f, 1.0f}); - b.add_input(N_("Roughness")) + b.add_input("Base Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Specular").default_value({0.03f, 0.03f, 0.03f, 1.0f}); + b.add_input("Roughness") .default_value(0.2f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Emissive Color")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("Transparency")) + b.add_input("Emissive Color").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("Transparency") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Clear Coat")) + b.add_input("Normal").hide_value(); + b.add_input("Clear Coat") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Clear Coat Roughness")) + b.add_input("Clear Coat Roughness") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Clear Coat Normal")).hide_value(); - b.add_input(N_("Ambient Occlusion")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSDF")); + b.add_input("Clear Coat Normal").hide_value(); + b.add_input("Ambient Occlusion").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSDF"); } #define socket_not_zero(sock) (in[sock].link || (clamp_f(in[sock].vec[0], 0.0f, 1.0f) > 1e-5f)) diff --git a/source/blender/nodes/shader/nodes/node_shader_emission.cc b/source/blender/nodes/shader/nodes/node_shader_emission.cc index e8277b705c4..9cc754fefc2 100644 --- a/source/blender/nodes/shader/nodes/node_shader_emission.cc +++ b/source/blender/nodes/shader/nodes/node_shader_emission.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_emission_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Strength")).default_value(1.0f).min(0.0f).max(1000000.0f); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("Emission")); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Strength").default_value(1.0f).min(0.0f).max(1000000.0f); + b.add_input("Weight").unavailable(); + b.add_output("Emission"); } static int node_shader_gpu_emission(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_fresnel.cc b/source/blender/nodes/shader/nodes/node_shader_fresnel.cc index de322f1d1f8..84d4ee7f06f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_fresnel.cc +++ b/source/blender/nodes/shader/nodes/node_shader_fresnel.cc @@ -7,9 +7,9 @@ namespace blender::nodes::node_shader_fresnel_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("IOR")).default_value(1.45f).min(0.0f).max(1000.0f); - b.add_input(N_("Normal")).hide_value(); - b.add_output(N_("Fac")); + b.add_input("IOR").default_value(1.45f).min(0.0f).max(1000.0f); + b.add_input("Normal").hide_value(); + b.add_output("Fac"); } static int node_shader_gpu_fresnel(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_gamma.cc b/source/blender/nodes/shader/nodes/node_shader_gamma.cc index 109c9bec539..365301c8c63 100644 --- a/source/blender/nodes/shader/nodes/node_shader_gamma.cc +++ b/source/blender/nodes/shader/nodes/node_shader_gamma.cc @@ -7,13 +7,10 @@ namespace blender::nodes::node_shader_gamma_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Gamma")) - .default_value(1.0f) - .min(0.001f) - .max(10.0f) - .subtype(PROP_UNSIGNED); - b.add_output(N_("Color")); + b.add_input("Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Gamma").default_value(1.0f).min(0.001f).max(10.0f).subtype( + PROP_UNSIGNED); + b.add_output("Color"); } static int node_shader_gpu_gamma(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.cc b/source/blender/nodes/shader/nodes/node_shader_geometry.cc index 38aa1cd9eed..1a04f007b0c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_geometry.cc +++ b/source/blender/nodes/shader/nodes/node_shader_geometry.cc @@ -7,15 +7,15 @@ namespace blender::nodes::node_shader_geometry_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Position")); - b.add_output(N_("Normal")); - b.add_output(N_("Tangent")); - b.add_output(N_("True Normal")); - b.add_output(N_("Incoming")); - b.add_output(N_("Parametric")); - b.add_output(N_("Backfacing")); - b.add_output(N_("Pointiness")); - b.add_output(N_("Random Per Island")); + b.add_output("Position"); + b.add_output("Normal"); + b.add_output("Tangent"); + b.add_output("True Normal"); + b.add_output("Incoming"); + b.add_output("Parametric"); + b.add_output("Backfacing"); + b.add_output("Pointiness"); + b.add_output("Random Per Island"); } static int node_shader_gpu_geometry(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_hair_info.cc b/source/blender/nodes/shader/nodes/node_shader_hair_info.cc index d2350e6b1d8..6fc46287f94 100644 --- a/source/blender/nodes/shader/nodes/node_shader_hair_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_hair_info.cc @@ -7,12 +7,12 @@ namespace blender::nodes::node_shader_hair_info_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Is Strand")); - b.add_output(N_("Intercept")); - b.add_output(N_("Length")); - b.add_output(N_("Thickness")); - b.add_output(N_("Tangent Normal")); - b.add_output(N_("Random")); + b.add_output("Is Strand"); + b.add_output("Intercept"); + b.add_output("Length"); + b.add_output("Thickness"); + b.add_output("Tangent Normal"); + b.add_output("Random"); } static int node_shader_gpu_hair_info(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_holdout.cc b/source/blender/nodes/shader/nodes/node_shader_holdout.cc index b8e4ef38e72..815ba5f08cd 100644 --- a/source/blender/nodes/shader/nodes/node_shader_holdout.cc +++ b/source/blender/nodes/shader/nodes/node_shader_holdout.cc @@ -7,8 +7,8 @@ namespace blender::nodes::node_shader_holdout_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("Holdout")); + b.add_input("Weight").unavailable(); + b.add_output("Holdout"); } static int gpu_shader_rgb(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc index 2970c59e378..33ed80808a4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc +++ b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc @@ -11,16 +11,13 @@ namespace blender::nodes::node_shader_hueSatVal_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Hue")).default_value(0.5f).min(0.0f).max(1.0f); - b.add_input(N_("Saturation")).default_value(1.0f).min(0.0f).max(2.0f); - b.add_input(CTX_N_(BLT_I18NCONTEXT_COLOR, "Value")) - .default_value(1.0f) - .min(0.0f) - .max(2.0f) - .translation_context(BLT_I18NCONTEXT_COLOR); - b.add_input(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output(N_("Color")); + b.add_input("Hue").default_value(0.5f).min(0.0f).max(1.0f); + b.add_input("Saturation").default_value(1.0f).min(0.0f).max(2.0f); + b.add_input("Value").default_value(1.0f).min(0.0f).max(2.0f).translation_context( + BLT_I18NCONTEXT_COLOR); + b.add_input("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output("Color"); } static int gpu_shader_hue_sat(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_ies_light.cc b/source/blender/nodes/shader/nodes/node_shader_ies_light.cc index d76626e4471..98152cfa0d9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ies_light.cc +++ b/source/blender/nodes/shader/nodes/node_shader_ies_light.cc @@ -10,9 +10,9 @@ namespace blender::nodes::node_shader_ies_light_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")).hide_value(); - b.add_input(N_("Strength")).default_value(1.0f).min(0.0f).max(1000000.0f); - b.add_output(N_("Fac")); + b.add_input("Vector").hide_value(); + b.add_input("Strength").default_value(1.0f).min(0.0f).max(1000000.0f); + b.add_output("Fac"); } static void node_shader_buts_ies(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_invert.cc b/source/blender/nodes/shader/nodes/node_shader_invert.cc index 32161030bad..b71bef597c1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_invert.cc +++ b/source/blender/nodes/shader/nodes/node_shader_invert.cc @@ -11,9 +11,9 @@ namespace blender::nodes::node_shader_invert_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input(N_("Color")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_output(N_("Color")); + b.add_input("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Color").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_output("Color"); } static int gpu_shader_invert(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc b/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc index 562c55d474e..f449805fbc4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc +++ b/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_layer_weight_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Blend")).default_value(0.5f).min(0.0f).max(1.0f); - b.add_input(N_("Normal")).hide_value(); - b.add_output(N_("Fresnel")); - b.add_output(N_("Facing")); + b.add_input("Blend").default_value(0.5f).min(0.0f).max(1.0f); + b.add_input("Normal").hide_value(); + b.add_output("Fresnel"); + b.add_output("Facing"); } static int node_shader_gpu_layer_weight(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc b/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc index a662f2fb155..cfc2073b8cb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc +++ b/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc @@ -7,11 +7,11 @@ namespace blender::nodes::node_shader_light_falloff_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Strength")).default_value(100.0f).min(0.0f).max(1000000.0f); - b.add_input(N_("Smooth")).default_value(0.0f).min(0.0f).max(1000.0f); - b.add_output(N_("Quadratic")); - b.add_output(N_("Linear")); - b.add_output(N_("Constant")); + b.add_input("Strength").default_value(100.0f).min(0.0f).max(1000000.0f); + b.add_input("Smooth").default_value(0.0f).min(0.0f).max(1000.0f); + b.add_output("Quadratic"); + b.add_output("Linear"); + b.add_output("Constant"); } static int node_shader_gpu_light_falloff(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_light_path.cc b/source/blender/nodes/shader/nodes/node_shader_light_path.cc index ccf706fd2f5..404b76cde50 100644 --- a/source/blender/nodes/shader/nodes/node_shader_light_path.cc +++ b/source/blender/nodes/shader/nodes/node_shader_light_path.cc @@ -7,19 +7,19 @@ namespace blender::nodes::node_shader_light_path_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Is Camera Ray")); - b.add_output(N_("Is Shadow Ray")); - b.add_output(N_("Is Diffuse Ray")); - b.add_output(N_("Is Glossy Ray")); - b.add_output(N_("Is Singular Ray")); - b.add_output(N_("Is Reflection Ray")); - b.add_output(N_("Is Transmission Ray")); - b.add_output(N_("Ray Length")); - b.add_output(N_("Ray Depth")); - b.add_output(N_("Diffuse Depth")); - b.add_output(N_("Glossy Depth")); - b.add_output(N_("Transparent Depth")); - b.add_output(N_("Transmission Depth")); + b.add_output("Is Camera Ray"); + b.add_output("Is Shadow Ray"); + b.add_output("Is Diffuse Ray"); + b.add_output("Is Glossy Ray"); + b.add_output("Is Singular Ray"); + b.add_output("Is Reflection Ray"); + b.add_output("Is Transmission Ray"); + b.add_output("Ray Length"); + b.add_output("Ray Depth"); + b.add_output("Diffuse Depth"); + b.add_output("Glossy Depth"); + b.add_output("Transparent Depth"); + b.add_output("Transmission Depth"); } static int node_shader_gpu_light_path(GPUMaterial *mat, 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 8645bd1cb2e..5c81ca96f71 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -23,20 +23,20 @@ NODE_STORAGE_FUNCS(NodeMapRange) static void sh_node_map_range_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Value")).min(-10000.0f).max(10000.0f).default_value(1.0f); - b.add_input(N_("From Min")).min(-10000.0f).max(10000.0f); - b.add_input(N_("From Max")).min(-10000.0f).max(10000.0f).default_value(1.0f); - b.add_input(N_("To Min")).min(-10000.0f).max(10000.0f); - b.add_input(N_("To Max")).min(-10000.0f).max(10000.0f).default_value(1.0f); - b.add_input(N_("Steps")).min(-10000.0f).max(10000.0f).default_value(4.0f); - b.add_input(N_("Vector")).min(0.0f).max(1.0f).hide_value(); - b.add_input(N_("From Min"), "From_Min_FLOAT3"); - b.add_input(N_("From Max"), "From_Max_FLOAT3").default_value(float3(1.0f)); - b.add_input(N_("To Min"), "To_Min_FLOAT3"); - b.add_input(N_("To Max"), "To_Max_FLOAT3").default_value(float3(1.0f)); - b.add_input(N_("Steps"), "Steps_FLOAT3").default_value(float3(4.0f)); - b.add_output(N_("Result")); - b.add_output(N_("Vector")); + b.add_input("Value").min(-10000.0f).max(10000.0f).default_value(1.0f); + b.add_input("From Min").min(-10000.0f).max(10000.0f); + b.add_input("From Max").min(-10000.0f).max(10000.0f).default_value(1.0f); + b.add_input("To Min").min(-10000.0f).max(10000.0f); + b.add_input("To Max").min(-10000.0f).max(10000.0f).default_value(1.0f); + b.add_input("Steps").min(-10000.0f).max(10000.0f).default_value(4.0f); + b.add_input("Vector").min(0.0f).max(1.0f).hide_value(); + b.add_input("From Min", "From_Min_FLOAT3"); + b.add_input("From Max", "From_Max_FLOAT3").default_value(float3(1.0f)); + b.add_input("To Min", "To_Min_FLOAT3"); + b.add_input("To Max", "To_Max_FLOAT3").default_value(float3(1.0f)); + b.add_input("Steps", "Steps_FLOAT3").default_value(float3(4.0f)); + b.add_output("Result"); + b.add_output("Vector"); } static void node_shader_buts_map_range(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.cc b/source/blender/nodes/shader/nodes/node_shader_mapping.cc index 6573784a3a6..cd753308563 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mapping.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mapping.cc @@ -14,26 +14,23 @@ namespace blender::nodes::node_shader_mapping_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")) - .default_value({0.0f, 0.0f, 0.0f}) - .min(-FLT_MAX) - .max(FLT_MAX); - b.add_input(N_("Location")) + b.add_input("Vector").default_value({0.0f, 0.0f, 0.0f}).min(-FLT_MAX).max(FLT_MAX); + b.add_input("Location") .default_value({0.0f, 0.0f, 0.0f}) .min(-FLT_MAX) .max(FLT_MAX) .subtype(PROP_TRANSLATION); - b.add_input(N_("Rotation")) + b.add_input("Rotation") .default_value({0.0f, 0.0f, 0.0f}) .min(-FLT_MAX) .max(FLT_MAX) .subtype(PROP_EULER); - b.add_input(N_("Scale")) + b.add_input("Scale") .default_value({1.0f, 1.0f, 1.0f}) .min(-FLT_MAX) .max(FLT_MAX) .subtype(PROP_XYZ); - b.add_output(N_("Vector")); + b.add_output("Vector"); } static void node_shader_buts_mapping(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc index 71b43dd82de..2f9e8ace450 100644 --- a/source/blender/nodes/shader/nodes/node_shader_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_math.cc @@ -19,16 +19,10 @@ namespace blender::nodes::node_shader_math_cc { static void sh_node_math_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Value")).default_value(0.5f).min(-10000.0f).max(10000.0f); - b.add_input(N_("Value"), "Value_001") - .default_value(0.5f) - .min(-10000.0f) - .max(10000.0f); - b.add_input(N_("Value"), "Value_002") - .default_value(0.5f) - .min(-10000.0f) - .max(10000.0f); - b.add_output(N_("Value")); + b.add_input("Value").default_value(0.5f).min(-10000.0f).max(10000.0f); + b.add_input("Value", "Value_001").default_value(0.5f).min(-10000.0f).max(10000.0f); + b.add_input("Value", "Value_002").default_value(0.5f).min(-10000.0f).max(10000.0f); + b.add_output("Value"); } class SocketSearchOp { diff --git a/source/blender/nodes/shader/nodes/node_shader_mix.cc b/source/blender/nodes/shader/nodes/node_shader_mix.cc index 7d63f9f9e14..5f46d1a3fd9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix.cc @@ -27,44 +27,43 @@ static void sh_node_mix_declare(NodeDeclarationBuilder &b) /** WARNING: * Input socket indices must be kept in sync with ntree_shader_disconnect_inactive_mix_branches */ - b.add_input(N_("Factor"), "Factor_Float") + b.add_input("Factor", "Factor_Float") .no_muted_links() .default_value(0.5f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Factor"), "Factor_Vector") + b.add_input("Factor", "Factor_Vector") .no_muted_links() .default_value(float3(0.5f)) .subtype(PROP_FACTOR); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "A"), "A_Float") + b.add_input("A", "A_Float") .min(-10000.0f) .max(10000.0f) .is_default_link_socket() .translation_context(BLT_I18NCONTEXT_ID_NODETREE); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "B"), "B_Float") + b.add_input("B", "B_Float") .min(-10000.0f) .max(10000.0f) .translation_context(BLT_I18NCONTEXT_ID_NODETREE); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "A"), "A_Vector") + b.add_input("A", "A_Vector") .is_default_link_socket() .translation_context(BLT_I18NCONTEXT_ID_NODETREE); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "B"), "B_Vector") - .translation_context(BLT_I18NCONTEXT_ID_NODETREE); + b.add_input("B", "B_Vector").translation_context(BLT_I18NCONTEXT_ID_NODETREE); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "A"), "A_Color") + b.add_input("A", "A_Color") .default_value({0.5f, 0.5f, 0.5f, 1.0f}) .is_default_link_socket() .translation_context(BLT_I18NCONTEXT_ID_NODETREE); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "B"), "B_Color") + b.add_input("B", "B_Color") .default_value({0.5f, 0.5f, 0.5f, 1.0f}) .translation_context(BLT_I18NCONTEXT_ID_NODETREE); - b.add_output(N_("Result"), "Result_Float"); - b.add_output(N_("Result"), "Result_Vector"); - b.add_output(N_("Result"), "Result_Color"); + b.add_output("Result", "Result_Float"); + b.add_output("Result", "Result_Vector"); + b.add_output("Result", "Result_Color"); }; static void sh_node_mix_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) @@ -226,7 +225,8 @@ static void node_mix_gather_link_searches(GatherLinkSearchOpParams ¶ms) } const std::string socket_name = params.in_out() == SOCK_IN ? "A" : "Result"; for (const EnumPropertyItem *item = rna_enum_ramp_blend_items; item->identifier != nullptr; - item++) { + item++) + { if (item->name != nullptr && item->identifier[0] != '\0') { params.add_item(CTX_IFACE_(BLT_I18NCONTEXT_ID_NODETREE, item->name), SocketSearchOp{socket_name, item->value}, diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc index 9c4a136dcc8..e9bfea623ad 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc @@ -12,10 +12,10 @@ namespace blender::nodes::node_shader_mix_rgb_cc { static void sh_node_mix_rgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input(N_("Color1")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_input(N_("Color2")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_output(N_("Color")); + b.add_input("Fac").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Color1").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_input("Color2").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output("Color"); } static const char *gpu_shader_get_name(int mode) diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc b/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc index 40b8619e32d..371f85e6a75 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_mix_shader_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input(N_("Shader")); - b.add_input(N_("Shader"), "Shader_001"); - b.add_output(N_("Shader")); + b.add_input("Fac").default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Shader"); + b.add_input("Shader", "Shader_001"); + b.add_output("Shader"); } static int node_shader_gpu_mix_shader(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_normal.cc b/source/blender/nodes/shader/nodes/node_shader_normal.cc index f2ca694cfef..820d871b29f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal.cc +++ b/source/blender/nodes/shader/nodes/node_shader_normal.cc @@ -11,17 +11,17 @@ namespace blender::nodes::node_shader_normal_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Normal")) + b.add_input("Normal") .default_value({0.0f, 0.0f, 1.0f}) .min(-1.0f) .max(1.0f) .subtype(PROP_DIRECTION); - b.add_output(N_("Normal")) + b.add_output("Normal") .default_value({0.0f, 0.0f, 1.0f}) .min(-1.0f) .max(1.0f) .subtype(PROP_DIRECTION); - b.add_output(N_("Dot")); + b.add_output("Dot"); } static int gpu_shader_normal(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc index d1f65c539ac..41fabaedfe8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc +++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc @@ -15,9 +15,9 @@ namespace blender::nodes::node_shader_normal_map_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Strength")).default_value(1.0f).min(0.0f).max(10.0f); - b.add_input(N_("Color")).default_value({0.5f, 0.5f, 1.0f, 1.0f}); - b.add_output(N_("Normal")); + b.add_input("Strength").default_value(1.0f).min(0.0f).max(10.0f); + b.add_input("Color").default_value({0.5f, 0.5f, 1.0f, 1.0f}); + b.add_output("Normal"); } static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_object_info.cc b/source/blender/nodes/shader/nodes/node_shader_object_info.cc index 410dc0746be..b785ca74ba8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_object_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_object_info.cc @@ -7,12 +7,12 @@ namespace blender::nodes::node_shader_object_info_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Location")); - b.add_output(N_("Color")); - b.add_output(N_("Alpha")); - b.add_output(N_("Object Index")); - b.add_output(N_("Material Index")); - b.add_output(N_("Random")); + b.add_output("Location"); + b.add_output("Color"); + b.add_output("Alpha"); + b.add_output("Object Index"); + b.add_output("Material Index"); + b.add_output("Random"); } static int node_shader_gpu_object_info(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc index c7e530c4687..5797eb97438 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc @@ -12,8 +12,8 @@ namespace blender::nodes::node_shader_output_aov_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("Value")).default_value(0.0f).min(0.0f).max(1.0f); + b.add_input("Color").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("Value").default_value(0.0f).min(0.0f).max(1.0f); } static void node_shader_buts_output_aov(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_output_light.cc b/source/blender/nodes/shader/nodes/node_shader_output_light.cc index b55eeb13afa..626d639be0b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_light.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_light.cc @@ -7,7 +7,7 @@ namespace blender::nodes::node_shader_output_light_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Surface")); + b.add_input("Surface"); } static int node_shader_gpu_output_light(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc index 6e7dd1cef30..067ab70b8c4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc @@ -10,18 +10,14 @@ namespace blender::nodes::node_shader_output_linestyle_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({1.0f, 0.0f, 1.0f, 1.0f}); - b.add_input(N_("Color Fac")) + b.add_input("Color").default_value({1.0f, 0.0f, 1.0f, 1.0f}); + b.add_input("Color Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Alpha")) - .default_value(1.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Alpha Fac")) + b.add_input("Alpha").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Alpha Fac") .default_value(1.0f) .min(0.0f) .max(1.0f) diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.cc b/source/blender/nodes/shader/nodes/node_shader_output_material.cc index 98df8d52ab9..da727181cbc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_material.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_material.cc @@ -9,11 +9,10 @@ namespace blender::nodes::node_shader_output_material_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Surface")); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); - b.add_input(N_("Displacement")).hide_value(); - b.add_input(N_("Thickness")).hide_value().unavailable(); /* Not used for now. */ + b.add_input("Surface"); + b.add_input("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Displacement").hide_value(); + b.add_input("Thickness").hide_value().unavailable(); /* Not used for now. */ } static int node_shader_gpu_output_material(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_output_world.cc b/source/blender/nodes/shader/nodes/node_shader_output_world.cc index 738ef6f5be8..6810b9fd237 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_world.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_world.cc @@ -7,9 +7,8 @@ namespace blender::nodes::node_shader_output_world_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Surface")); - b.add_input(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Surface"); + b.add_input("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static int node_shader_gpu_output_world(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.cc b/source/blender/nodes/shader/nodes/node_shader_particle_info.cc index 30f799c49ae..4b31eca3569 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.cc @@ -9,17 +9,17 @@ namespace blender::nodes::node_shader_particle_info_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Index")); - b.add_output(N_("Random")); - b.add_output(N_("Age")); - b.add_output(N_("Lifetime")); - b.add_output(N_("Location")); + b.add_output("Index"); + b.add_output("Random"); + b.add_output("Age"); + b.add_output("Lifetime"); + b.add_output("Location"); #if 0 /* quaternion sockets not yet supported */ - b.add_output(N_("Rotation")); + b.add_output("Rotation"); #endif - b.add_output(N_("Size")); - b.add_output(N_("Velocity")); - b.add_output(N_("Angular Velocity")); + b.add_output("Size"); + b.add_output("Velocity"); + b.add_output("Angular Velocity"); } static int gpu_shader_particle_info(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_point_info.cc b/source/blender/nodes/shader/nodes/node_shader_point_info.cc index 81c04ed39a5..fd221e33bde 100644 --- a/source/blender/nodes/shader/nodes/node_shader_point_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_point_info.cc @@ -7,9 +7,9 @@ namespace blender::nodes::node_shader_point_info_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Position")); - b.add_output(N_("Radius")); - b.add_output(N_("Random")); + b.add_output("Position"); + b.add_output("Radius"); + b.add_output("Random"); } static int node_shader_gpu_point_info(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_rgb.cc index 78b625b119b..fb64fb6f0ae 100644 --- a/source/blender/nodes/shader/nodes/node_shader_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_rgb.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_shader_rgb_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Color")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output("Color").default_value({0.5f, 0.5f, 0.5f, 1.0f}); } static int gpu_shader_rgb(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc b/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc index 73201e9a482..d43521b1c88 100644 --- a/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc +++ b/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc @@ -13,8 +13,8 @@ namespace blender::nodes::node_shader_rgb_to_bw_cc { static void sh_node_rgbtobw_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_output(N_("Val")); + b.add_input("Color").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_output("Val"); } static int gpu_shader_rgbtobw(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc index 72b644ce15c..e9b3af493ec 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc @@ -25,10 +25,10 @@ NODE_STORAGE_FUNCS(NodeCombSepColor) static void sh_node_sepcolor_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output(N_("Red")); - b.add_output(N_("Green")); - b.add_output(N_("Blue")); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output("Red"); + b.add_output("Green"); + b.add_output("Blue"); } static void node_sepcolor_update(bNodeTree * /*ntree*/, bNode *node) @@ -93,18 +93,10 @@ NODE_STORAGE_FUNCS(NodeCombSepColor) static void sh_node_combcolor_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Red")).default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); - b.add_input(N_("Green")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_input(N_("Blue")) - .default_value(0.0f) - .min(0.0f) - .max(1.0f) - .subtype(PROP_FACTOR); - b.add_output(N_("Color")); + b.add_input("Red").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Green").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_input("Blue").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); + b.add_output("Color"); } static void node_combcolor_update(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc index 319cedb424d..5952a1ffd7d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc @@ -13,10 +13,10 @@ namespace blender::nodes::node_shader_sepcomb_hsv_cc { static void node_declare_sephsv(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0}); - b.add_output(N_("H")); - b.add_output(N_("S")); - b.add_output(N_("V")); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0}); + b.add_output("H"); + b.add_output("S"); + b.add_output("V"); } static int gpu_shader_sephsv(GPUMaterial *mat, @@ -51,10 +51,10 @@ namespace blender::nodes::node_shader_sepcomb_hsv_cc { static void node_declare_combhsv(NodeDeclarationBuilder &b) { - b.add_input(N_("H")).default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_UNSIGNED); - b.add_input(N_("S")).default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_UNSIGNED); - b.add_input(N_("V")).default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_UNSIGNED); - b.add_output(N_("Color")); + b.add_input("H").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_UNSIGNED); + b.add_input("S").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_UNSIGNED); + b.add_input("V").default_value(0.0f).min(0.0f).max(1.0f).subtype(PROP_UNSIGNED); + b.add_output("Color"); } static int gpu_shader_combhsv(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc index d408f8de744..795fb35256c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc @@ -12,10 +12,10 @@ namespace blender::nodes::node_shader_sepcomb_rgb_cc { static void sh_node_seprgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_output(N_("R")); - b.add_output(N_("G")); - b.add_output(N_("B")); + b.add_input("Image").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_output("R"); + b.add_output("G"); + b.add_output("B"); } static int gpu_shader_seprgb(GPUMaterial *mat, @@ -90,10 +90,10 @@ namespace blender::nodes::node_shader_sepcomb_rgb_cc { static void sh_node_combrgb_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("R")).min(0.0f).max(1.0f); - b.add_input(N_("G")).min(0.0f).max(1.0f); - b.add_input(N_("B")).min(0.0f).max(1.0f); - b.add_output(N_("Image")); + b.add_input("R").min(0.0f).max(1.0f); + b.add_input("G").min(0.0f).max(1.0f); + b.add_input("B").min(0.0f).max(1.0f); + b.add_output("Image"); } static int gpu_shader_combrgb(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc index 382df101c2b..fe2a45efaeb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc @@ -12,10 +12,10 @@ namespace blender::nodes::node_shader_sepcomb_xyz_cc { static void sh_node_sepxyz_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).min(-10000.0f).max(10000.0f); - b.add_output(N_("X")); - b.add_output(N_("Y")); - b.add_output(N_("Z")); + b.add_input("Vector").min(-10000.0f).max(10000.0f); + b.add_output("X"); + b.add_output("Y"); + b.add_output("Z"); } static int gpu_shader_sepxyz(GPUMaterial *mat, @@ -106,10 +106,10 @@ namespace blender::nodes::node_shader_sepcomb_xyz_cc { static void sh_node_combxyz_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("X")).min(-10000.0f).max(10000.0f); - b.add_input(N_("Y")).min(-10000.0f).max(10000.0f); - b.add_input(N_("Z")).min(-10000.0f).max(10000.0f); - b.add_output(N_("Vector")); + b.add_input("X").min(-10000.0f).max(10000.0f); + b.add_input("Y").min(-10000.0f).max(10000.0f); + b.add_input("Z").min(-10000.0f).max(10000.0f); + b.add_output("Vector"); } static int gpu_shader_combxyz(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc index bf8fbf6bcf7..88e09f574d7 100644 --- a/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc @@ -7,9 +7,9 @@ namespace blender::nodes::node_shader_shader_to_rgb_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Shader")); - b.add_output(N_("Color")); - b.add_output(N_("Alpha")); + b.add_input("Shader"); + b.add_output("Color"); + b.add_output("Alpha"); } static int node_shader_gpu_shadertorgb(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_squeeze.cc b/source/blender/nodes/shader/nodes/node_shader_squeeze.cc index c9756d22b00..ae7644f56ec 100644 --- a/source/blender/nodes/shader/nodes/node_shader_squeeze.cc +++ b/source/blender/nodes/shader/nodes/node_shader_squeeze.cc @@ -11,10 +11,10 @@ namespace blender::nodes::node_shader_squeeze_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Value")).default_value(0.0f).min(-100.0f).max(100.0f); - b.add_input(N_("Width")).default_value(1.0f).min(-100.0f).max(100.0f); - b.add_input(N_("Center")).default_value(0.0f).min(-100.0f).max(100.0f); - b.add_output(N_("Value")); + b.add_input("Value").default_value(0.0f).min(-100.0f).max(100.0f); + b.add_input("Width").default_value(1.0f).min(-100.0f).max(100.0f); + b.add_input("Center").default_value(0.0f).min(-100.0f).max(100.0f); + b.add_output("Value"); } static int gpu_shader_squeeze(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc index 28722e4df3c..d28b20f33b6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc +++ b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc @@ -12,23 +12,22 @@ namespace blender::nodes::node_shader_subsurface_scattering_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Scale")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Radius")) + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Scale").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Radius") .default_value({1.0f, 0.2f, 0.1f}) .min(0.0f) .max(100.0f) .compact(); - b.add_input(N_("IOR")).default_value(1.4f).min(1.01f).max(3.8f).subtype( - PROP_FACTOR); - b.add_input(N_("Anisotropy")) + b.add_input("IOR").default_value(1.4f).min(1.01f).max(3.8f).subtype(PROP_FACTOR); + b.add_input("Anisotropy") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Normal")).hide_value(); - b.add_input(N_("Weight")).unavailable(); - b.add_output(N_("BSSRDF")); + b.add_input("Normal").hide_value(); + b.add_input("Weight").unavailable(); + b.add_output("BSSRDF"); } static void node_shader_buts_subsurface(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index 6e4f7db178a..6bbf2883eaa 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -14,7 +14,7 @@ namespace blender::nodes::node_shader_tangent_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Tangent")); + b.add_output("Tangent"); } static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *ptr) 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 67c474b61e6..6ce03eb4948 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc @@ -13,41 +13,39 @@ namespace blender::nodes::node_shader_tex_brick_cc { static void sh_node_tex_brick_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")) - .min(-10000.0f) - .max(10000.0f) - .implicit_field(implicit_field_inputs::position); - b.add_input(N_("Color1")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Color2")).default_value({0.2f, 0.2f, 0.2f, 1.0f}); - b.add_input(N_("Mortar")).default_value({0.0f, 0.0f, 0.0f, 1.0f}).no_muted_links(); - b.add_input(N_("Scale")) + b.add_input("Vector").min(-10000.0f).max(10000.0f).implicit_field( + implicit_field_inputs::position); + b.add_input("Color1").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Color2").default_value({0.2f, 0.2f, 0.2f, 1.0f}); + b.add_input("Mortar").default_value({0.0f, 0.0f, 0.0f, 1.0f}).no_muted_links(); + b.add_input("Scale") .min(-1000.0f) .max(1000.0f) .default_value(5.0f) .no_muted_links(); - b.add_input(N_("Mortar Size")) + b.add_input("Mortar Size") .min(0.0f) .max(0.125f) .default_value(0.02f) .no_muted_links(); - b.add_input(N_("Mortar Smooth")) + b.add_input("Mortar Smooth") .min(0.0f) .max(1.0f) .default_value(0.1f) .no_muted_links(); - b.add_input(N_("Bias")).min(-1.0f).max(1.0f).no_muted_links(); - b.add_input(N_("Brick Width")) + b.add_input("Bias").min(-1.0f).max(1.0f).no_muted_links(); + b.add_input("Brick Width") .min(0.01f) .max(100.0f) .default_value(0.5f) .no_muted_links(); - b.add_input(N_("Row Height")) + b.add_input("Row Height") .min(0.01f) .max(100.0f) .default_value(0.25f) .no_muted_links(); - b.add_output(N_("Color")); - b.add_output(N_("Fac")); + b.add_output("Color"); + b.add_output("Fac"); } static void node_shader_buts_tex_brick(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 b75a2a496bd..e0e9a31a189 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc @@ -8,19 +8,17 @@ namespace blender::nodes::node_shader_tex_checker_cc { static void sh_node_tex_checker_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")) - .min(-10000.0f) - .max(10000.0f) - .implicit_field(implicit_field_inputs::position); - b.add_input(N_("Color1")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Color2")).default_value({0.2f, 0.2f, 0.2f, 1.0f}); - b.add_input(N_("Scale")) + b.add_input("Vector").min(-10000.0f).max(10000.0f).implicit_field( + implicit_field_inputs::position); + b.add_input("Color1").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Color2").default_value({0.2f, 0.2f, 0.2f, 1.0f}); + b.add_input("Scale") .min(-10000.0f) .max(10000.0f) .default_value(5.0f) .no_muted_links(); - b.add_output(N_("Color")); - b.add_output(N_("Fac")); + b.add_output("Color"); + b.add_output("Fac"); } static void node_shader_init_tex_checker(bNodeTree * /*ntree*/, bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc index 399446039be..f76f84ae29e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc @@ -12,13 +12,13 @@ namespace blender::nodes::node_shader_tex_coord_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Generated")); - b.add_output(N_("Normal")); - b.add_output(N_("UV")); - b.add_output(N_("Object")); - b.add_output(N_("Camera")); - b.add_output(N_("Window")); - b.add_output(N_("Reflection")); + b.add_output("Generated"); + b.add_output("Normal"); + b.add_output("UV"); + b.add_output("Object"); + b.add_output("Camera"); + b.add_output("Window"); + b.add_output("Reflection"); } static void node_shader_buts_tex_coord(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc b/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc index 0c666ee8c14..f35244d4cb2 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc @@ -9,8 +9,8 @@ namespace blender::nodes::node_shader_tex_environment_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")).hide_value(); - b.add_output(N_("Color")).no_muted_links(); + b.add_input("Vector").hide_value(); + b.add_output("Color").no_muted_links(); } static void node_shader_init_tex_environment(bNodeTree * /*ntree*/, bNode *node) 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 333cf51c24b..f9cc498fd8a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc @@ -11,11 +11,9 @@ namespace blender::nodes::node_shader_tex_gradient_cc { static void sh_node_tex_gradient_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")) - .hide_value() - .implicit_field(implicit_field_inputs::position); - b.add_output(N_("Color")).no_muted_links(); - b.add_output(N_("Fac")).no_muted_links(); + b.add_input("Vector").hide_value().implicit_field(implicit_field_inputs::position); + b.add_output("Color").no_muted_links(); + b.add_output("Fac").no_muted_links(); } static void node_shader_buts_tex_gradient(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 75d8447c664..61755e0e15b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc @@ -10,9 +10,9 @@ namespace blender::nodes::node_shader_tex_image_cc { static void sh_node_tex_image_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).implicit_field(implicit_field_inputs::position); - b.add_output(N_("Color")).no_muted_links(); - b.add_output(N_("Alpha")).no_muted_links(); + b.add_input("Vector").implicit_field(implicit_field_inputs::position); + b.add_output("Color").no_muted_links(); + b.add_output("Alpha").no_muted_links(); } static void node_shader_init_tex_image(bNodeTree * /*ntree*/, bNode *node) 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 4336589bd6c..538b2977f42 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -11,11 +11,11 @@ namespace blender::nodes::node_shader_tex_magic_cc { static void sh_node_tex_magic_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).implicit_field(implicit_field_inputs::position); - b.add_input(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(1.0f); - b.add_output(N_("Color")).no_muted_links(); - b.add_output(N_("Fac")).no_muted_links(); + b.add_input("Vector").implicit_field(implicit_field_inputs::position); + b.add_input("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input("Distortion").min(-1000.0f).max(1000.0f).default_value(1.0f); + b.add_output("Color").no_muted_links(); + b.add_output("Fac").no_muted_links(); } static void node_shader_buts_tex_magic(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 9cf60f6e5ef..e16c8a33fa6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -15,20 +15,18 @@ NODE_STORAGE_FUNCS(NodeTexMusgrave) static void sh_node_tex_musgrave_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")) - .hide_value() - .implicit_field(implicit_field_inputs::position); - b.add_input(N_("W")).min(-1000.0f).max(1000.0f).make_available([](bNode &node) { + b.add_input("Vector").hide_value().implicit_field(implicit_field_inputs::position); + b.add_input("W").min(-1000.0f).max(1000.0f).make_available([](bNode &node) { /* Default to 1 instead of 4, because it is much faster. */ node_storage(node).dimensions = 1; }); - b.add_input(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input(N_("Detail")).min(0.0f).max(15.0f).default_value(2.0f); - b.add_input(N_("Dimension")).min(0.0f).max(1000.0f).default_value(2.0f); - b.add_input(N_("Lacunarity")).min(0.0f).max(1000.0f).default_value(2.0f); - b.add_input(N_("Offset")).min(-1000.0f).max(1000.0f); - b.add_input(N_("Gain")).min(0.0f).max(1000.0f).default_value(1.0f); - b.add_output(N_("Fac")).no_muted_links(); + b.add_input("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input("Detail").min(0.0f).max(15.0f).default_value(2.0f); + b.add_input("Dimension").min(0.0f).max(1000.0f).default_value(2.0f); + b.add_input("Lacunarity").min(0.0f).max(1000.0f).default_value(2.0f); + b.add_input("Offset").min(-1000.0f).max(1000.0f); + b.add_input("Gain").min(0.0f).max(1000.0f).default_value(1.0f); + b.add_output("Fac").no_muted_links(); } static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 b3e4db2e14e..81eb814398e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -15,21 +15,21 @@ NODE_STORAGE_FUNCS(NodeTexNoise) static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).implicit_field(implicit_field_inputs::position); - b.add_input(N_("W")).min(-1000.0f).max(1000.0f).make_available([](bNode &node) { + b.add_input("Vector").implicit_field(implicit_field_inputs::position); + b.add_input("W").min(-1000.0f).max(1000.0f).make_available([](bNode &node) { /* Default to 1 instead of 4, because it is much faster. */ node_storage(node).dimensions = 1; }); - b.add_input(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input(N_("Detail")).min(0.0f).max(15.0f).default_value(2.0f); - b.add_input(N_("Roughness")) + b.add_input("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input("Detail").min(0.0f).max(15.0f).default_value(2.0f); + b.add_input("Roughness") .min(0.0f) .max(1.0f) .default_value(0.5f) .subtype(PROP_FACTOR); - b.add_input(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(0.0f); - b.add_output(N_("Fac")).no_muted_links(); - b.add_output(N_("Color")).no_muted_links(); + b.add_input("Distortion").min(-1000.0f).max(1000.0f).default_value(0.0f); + b.add_output("Fac").no_muted_links(); + b.add_output("Color").no_muted_links(); } static void node_shader_buts_tex_noise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc index e8c9d7ddef0..cfb9f0425d0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc @@ -12,9 +12,9 @@ namespace blender::nodes::node_shader_tex_pointdensity_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")).hide_value(); - b.add_output(N_("Color")); - b.add_output(N_("Density")); + b.add_input("Vector").hide_value(); + b.add_output("Color"); + b.add_output("Density"); } static void node_shader_buts_tex_pointdensity(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc index b2fd5de9f77..4242618c900 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc @@ -18,8 +18,8 @@ namespace blender::nodes::node_shader_tex_sky_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")).hide_value(); - b.add_output(N_("Color")).no_muted_links(); + b.add_input("Vector").hide_value(); + b.add_output("Color").no_muted_links(); } static void node_shader_buts_tex_sky(uiLayout *layout, bContext *C, PointerRNA *ptr) 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 c7810ebe5c2..74bfab18edb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc @@ -15,40 +15,37 @@ NODE_STORAGE_FUNCS(NodeTexVoronoi) static void sh_node_tex_voronoi_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")) - .hide_value() - .implicit_field(implicit_field_inputs::position); - b.add_input(N_("W")).min(-1000.0f).max(1000.0f).make_available([](bNode &node) { + b.add_input("Vector").hide_value().implicit_field(implicit_field_inputs::position); + b.add_input("W").min(-1000.0f).max(1000.0f).make_available([](bNode &node) { /* Default to 1 instead of 4, because it is much faster. */ node_storage(node).dimensions = 1; }); - b.add_input(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input(N_("Smoothness")) + b.add_input("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input("Smoothness") .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR) .make_available([](bNode &node) { node_storage(node).feature = SHD_VORONOI_SMOOTH_F1; }); - b.add_input(N_("Exponent")) + b.add_input("Exponent") .min(0.0f) .max(32.0f) .default_value(0.5f) .make_available([](bNode &node) { node_storage(node).distance = SHD_VORONOI_MINKOWSKI; }); - b.add_input(N_("Randomness")) + b.add_input("Randomness") .min(0.0f) .max(1.0f) .default_value(1.0f) .subtype(PROP_FACTOR); - b.add_output(N_("Distance")).no_muted_links(); - b.add_output(N_("Color")).no_muted_links(); - b.add_output(N_("Position")).no_muted_links(); - b.add_output(N_("W")).no_muted_links().make_available([](bNode &node) { + b.add_output("Distance").no_muted_links(); + b.add_output("Color").no_muted_links(); + b.add_output("Position").no_muted_links(); + b.add_output("W").no_muted_links().make_available([](bNode &node) { /* Default to 1 instead of 4, because it is much faster. */ node_storage(node).dimensions = 1; }); - b.add_output(N_("Radius")).no_muted_links().make_available([](bNode &node) { - node_storage(node).feature = SHD_VORONOI_N_SPHERE_RADIUS; - }); + b.add_output("Radius").no_muted_links().make_available( + [](bNode &node) { node_storage(node).feature = SHD_VORONOI_N_SPHERE_RADIUS; }); } static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 87271d60258..77d420d0079 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc @@ -13,19 +13,19 @@ namespace blender::nodes::node_shader_tex_wave_cc { static void sh_node_tex_wave_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).implicit_field(implicit_field_inputs::position); - b.add_input(N_("Scale")).min(-1000.0f).max(1000.0f).default_value(5.0f); - b.add_input(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(0.0f); - b.add_input(N_("Detail")).min(0.0f).max(15.0f).default_value(2.0f); - b.add_input(N_("Detail Scale")).min(-1000.0f).max(1000.0f).default_value(1.0f); - b.add_input(N_("Detail Roughness")) + b.add_input("Vector").implicit_field(implicit_field_inputs::position); + b.add_input("Scale").min(-1000.0f).max(1000.0f).default_value(5.0f); + b.add_input("Distortion").min(-1000.0f).max(1000.0f).default_value(0.0f); + b.add_input("Detail").min(0.0f).max(15.0f).default_value(2.0f); + b.add_input("Detail Scale").min(-1000.0f).max(1000.0f).default_value(1.0f); + b.add_input("Detail Roughness") .min(0.0f) .max(1.0f) .default_value(0.5f) .subtype(PROP_FACTOR); - b.add_input(N_("Phase Offset")).min(-1000.0f).max(1000.0f).default_value(0.0f); - b.add_output(N_("Color")).no_muted_links(); - b.add_output(N_("Fac")).no_muted_links(); + b.add_input("Phase Offset").min(-1000.0f).max(1000.0f).default_value(0.0f); + b.add_output("Color").no_muted_links(); + b.add_output("Fac").no_muted_links(); } static void node_shader_buts_tex_wave(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 d9b3bc32955..e579f341e4b 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 @@ -13,16 +13,14 @@ namespace blender::nodes::node_shader_tex_white_noise_cc { static void sh_node_tex_white_noise_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")) - .min(-10000.0f) - .max(10000.0f) - .implicit_field(implicit_field_inputs::position); - b.add_input(N_("W")).min(-10000.0f).max(10000.0f).make_available([](bNode &node) { + b.add_input("Vector").min(-10000.0f).max(10000.0f).implicit_field( + implicit_field_inputs::position); + b.add_input("W").min(-10000.0f).max(10000.0f).make_available([](bNode &node) { /* Default to 1 instead of 4, because it is faster. */ node.custom1 = 1; }); - b.add_output(N_("Value")); - b.add_output(N_("Color")); + b.add_output("Value"); + b.add_output("Color"); } static void node_shader_buts_white_noise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc b/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc index 738b0cf488c..841fe238214 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc @@ -10,7 +10,7 @@ namespace blender::nodes::node_shader_uv_along_stroke_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("UV")); + b.add_output("UV"); } static void node_shader_buts_uvalongstroke(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc index 5c92ba8001f..a886042586c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc @@ -16,7 +16,7 @@ namespace blender::nodes::node_shader_uvmap_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("UV")); + b.add_output("UV"); } static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_value.cc b/source/blender/nodes/shader/nodes/node_shader_value.cc index e3916b71a4c..c698af7ebbf 100644 --- a/source/blender/nodes/shader/nodes/node_shader_value.cc +++ b/source/blender/nodes/shader/nodes/node_shader_value.cc @@ -11,7 +11,7 @@ namespace blender::nodes::node_shader_value_cc { static void sh_node_value_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Value")); + b.add_output("Value"); } static int gpu_shader_value(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc index a14312ce50c..2b7e66f8cb2 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_vector_displacement_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")).hide_value(); - b.add_input(N_("Midlevel")).default_value(0.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Scale")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_output(N_("Displacement")); + b.add_input("Vector").hide_value(); + b.add_input("Midlevel").default_value(0.0f).min(0.0f).max(1000.0f); + b.add_input("Scale").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_output("Displacement"); } static void node_shader_init_vector_displacement(bNodeTree * /*ntree*/, bNode *node) 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 617602dd64e..8cd2f381806 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -20,12 +20,12 @@ namespace blender::nodes::node_shader_vector_math_cc { static void sh_node_vector_math_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).min(-10000.0f).max(10000.0f); - b.add_input(N_("Vector"), "Vector_001").min(-10000.0f).max(10000.0f); - b.add_input(N_("Vector"), "Vector_002").min(-10000.0f).max(10000.0f); - b.add_input(N_("Scale")).default_value(1.0f).min(-10000.0f).max(10000.0f); - b.add_output(N_("Vector")); - b.add_output(N_("Value")); + b.add_input("Vector").min(-10000.0f).max(10000.0f); + b.add_input("Vector", "Vector_001").min(-10000.0f).max(10000.0f); + b.add_input("Vector", "Vector_002").min(-10000.0f).max(10000.0f); + b.add_input("Scale").default_value(1.0f).min(-10000.0f).max(10000.0f); + b.add_output("Vector"); + b.add_output("Value"); } static void node_shader_buts_vect_math(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) 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 2c7f4200744..8a0ceb20af0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc @@ -15,18 +15,18 @@ namespace blender::nodes::node_shader_vector_rotate_cc { static void sh_node_vector_rotate_declare(NodeDeclarationBuilder &b) { b.is_function_node(); - b.add_input(N_("Vector")).min(0.0f).max(1.0f).hide_value(); - b.add_input(N_("Center")); - b.add_input(N_("Axis")) + b.add_input("Vector").min(0.0f).max(1.0f).hide_value(); + b.add_input("Center"); + b.add_input("Axis") .min(-1.0f) .max(1.0f) .default_value({0.0f, 0.0f, 1.0f}) .make_available([](bNode &node) { node.custom1 = NODE_VECTOR_ROTATE_TYPE_AXIS; }); - b.add_input(N_("Angle")).subtype(PROP_ANGLE); - b.add_input(N_("Rotation")).subtype(PROP_EULER).make_available([](bNode &node) { + b.add_input("Angle").subtype(PROP_ANGLE); + b.add_input("Rotation").subtype(PROP_EULER).make_available([](bNode &node) { node.custom1 = NODE_VECTOR_ROTATE_TYPE_EULER_XYZ; }); - b.add_output(N_("Vector")); + b.add_output("Vector"); } static void node_shader_buts_vector_rotate(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc b/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc index 9013f197a21..c60c3be52ce 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc @@ -14,11 +14,11 @@ namespace blender::nodes::node_shader_vector_transform_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Vector")) + b.add_input("Vector") .default_value({0.5f, 0.5f, 0.5f}) .min(-10000.0f) .max(10000.0f); - b.add_output(N_("Vector")); + b.add_output("Vector"); } static void node_shader_buts_vect_transform(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc index 518e95ed24b..de64b620881 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc @@ -14,8 +14,8 @@ namespace blender::nodes::node_shader_vertex_color_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Color")); - b.add_output(N_("Alpha")); + b.add_output("Color"); + b.add_output("Alpha"); } static void node_shader_buts_vertex_color(uiLayout *layout, bContext *C, PointerRNA *ptr) diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc b/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc index 7cd61498c6c..1e469f57b9d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc @@ -7,11 +7,10 @@ namespace blender::nodes::node_shader_volume_absorption_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Density")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Weight")).unavailable(); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Density").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Weight").unavailable(); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static int node_shader_gpu_volume_absorption(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_info.cc b/source/blender/nodes/shader/nodes/node_shader_volume_info.cc index 11476faaaa1..ac4e8fdfcd1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_info.cc @@ -7,10 +7,10 @@ namespace blender::nodes::node_shader_volume_info_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_output(N_("Color")); - b.add_output(N_("Density")); - b.add_output(N_("Flame")); - b.add_output(N_("Temperature")); + b.add_output("Color"); + b.add_output("Density"); + b.add_output("Flame"); + b.add_output("Temperature"); } static int node_shader_gpu_volume_info(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc b/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc index 633d5a7471e..7056102b468 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc @@ -9,29 +9,28 @@ namespace blender::nodes::node_shader_volume_principled_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); - b.add_input(N_("Color Attribute")); - b.add_input(N_("Density")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Density Attribute")).default_value("density"); - b.add_input(N_("Anisotropy")) + b.add_input("Color").default_value({0.5f, 0.5f, 0.5f, 1.0f}); + b.add_input("Color Attribute"); + b.add_input("Density").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Density Attribute").default_value("density"); + b.add_input("Anisotropy") .default_value(0.0f) .min(-1.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Absorption Color")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); - b.add_input(N_("Emission Strength")).default_value(0.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Emission Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Blackbody Intensity")) + b.add_input("Absorption Color").default_value({0.0f, 0.0f, 0.0f, 1.0f}); + b.add_input("Emission Strength").default_value(0.0f).min(0.0f).max(1000.0f); + b.add_input("Emission Color").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Blackbody Intensity") .default_value(0.0f) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Blackbody Tint")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); - b.add_input(N_("Temperature")).default_value(1000.0f).min(0.0f).max(6500.0f); - b.add_input(N_("Temperature Attribute")).default_value("temperature"); - b.add_input(N_("Weight")).unavailable(); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Blackbody Tint").default_value({1.0f, 1.0f, 1.0f, 1.0f}); + b.add_input("Temperature").default_value(1000.0f).min(0.0f).max(6500.0f); + b.add_input("Temperature Attribute").default_value("temperature"); + b.add_input("Weight").unavailable(); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static void attribute_post_process(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc b/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc index 3447bebc787..3dbd2564e0e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc @@ -7,16 +7,15 @@ namespace blender::nodes::node_shader_volume_scatter_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Color")).default_value({0.8f, 0.8f, 0.8f, 1.0f}); - b.add_input(N_("Density")).default_value(1.0f).min(0.0f).max(1000.0f); - b.add_input(N_("Anisotropy")) + b.add_input("Color").default_value({0.8f, 0.8f, 0.8f, 1.0f}); + b.add_input("Density").default_value(1.0f).min(0.0f).max(1000.0f); + b.add_input("Anisotropy") .default_value(0.0f) .min(-1.0f) .max(1.0f) .subtype(PROP_FACTOR); - b.add_input(N_("Weight")).unavailable(); - b.add_output(CTX_N_(BLT_I18NCONTEXT_ID_ID, "Volume")) - .translation_context(BLT_I18NCONTEXT_ID_ID); + b.add_input("Weight").unavailable(); + b.add_output("Volume").translation_context(BLT_I18NCONTEXT_ID_ID); } static int node_shader_gpu_volume_scatter(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_wavelength.cc b/source/blender/nodes/shader/nodes/node_shader_wavelength.cc index 4d7bfda393f..cd1a7ee0818 100644 --- a/source/blender/nodes/shader/nodes/node_shader_wavelength.cc +++ b/source/blender/nodes/shader/nodes/node_shader_wavelength.cc @@ -9,8 +9,8 @@ namespace blender::nodes::node_shader_wavelength_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Wavelength")).default_value(500.0f).min(380.0f).max(780.0f); - b.add_output(N_("Color")); + b.add_input("Wavelength").default_value(500.0f).min(380.0f).max(780.0f); + b.add_output("Color"); } static int node_shader_gpu_wavelength(GPUMaterial *mat, diff --git a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc index 734c1a6af08..dcd7d5052b0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc +++ b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc @@ -10,8 +10,8 @@ namespace blender::nodes::node_shader_wireframe_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input(N_("Size")).default_value(0.01f).min(0.0f).max(100.0f); - b.add_output(N_("Fac")); + b.add_input("Size").default_value(0.01f).min(0.0f).max(100.0f); + b.add_output("Fac"); } static void node_shader_buts_wireframe(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)