From c33c93f886d724578fc52902b00f9561ff2f6e86 Mon Sep 17 00:00:00 2001 From: Omar Emara Date: Mon, 12 May 2025 12:50:38 +0200 Subject: [PATCH] Compositor: Use node discovery for node registration This patch uses the add_node_discovery node registration mechanism already used by Geometry and Function nodes. This is done to reduce the number of places needed to add a new node. Pull Request: https://projects.blender.org/blender/blender/pulls/138755 --- source/blender/nodes/NOD_composite.hh | 5 +- source/blender/nodes/NOD_register.hh | 2 +- source/blender/nodes/composite/CMakeLists.txt | 14 ++- .../composite/node_composite_register.cc | 115 ------------------ .../composite/node_composite_register.hh | 110 ----------------- .../nodes/composite/node_composite_util.hh | 4 +- .../nodes/node_composite_alpha_over.cc | 3 +- .../nodes/node_composite_antialiasing.cc | 3 +- .../nodes/node_composite_bilateralblur.cc | 3 +- .../composite/nodes/node_composite_blur.cc | 3 +- .../nodes/node_composite_bokehblur.cc | 3 +- .../nodes/node_composite_bokehimage.cc | 3 +- .../composite/nodes/node_composite_boxmask.cc | 3 +- .../nodes/node_composite_brightness.cc | 3 +- .../nodes/node_composite_channel_matte.cc | 3 +- .../nodes/node_composite_chroma_matte.cc | 3 +- .../nodes/node_composite_color_matte.cc | 3 +- .../nodes/node_composite_color_spill.cc | 3 +- .../nodes/node_composite_colorbalance.cc | 3 +- .../nodes/node_composite_colorcorrection.cc | 3 +- .../composite/nodes/node_composite_common.cc | 3 +- .../nodes/node_composite_composite.cc | 3 +- .../node_composite_convert_color_space.cc | 3 +- .../nodes/node_composite_cornerpin.cc | 3 +- .../composite/nodes/node_composite_crop.cc | 3 +- .../nodes/node_composite_cryptomatte.cc | 6 +- .../composite/nodes/node_composite_curves.cc | 9 +- .../composite/nodes/node_composite_defocus.cc | 3 +- .../composite/nodes/node_composite_denoise.cc | 3 +- .../nodes/node_composite_despeckle.cc | 3 +- .../nodes/node_composite_diff_matte.cc | 3 +- .../composite/nodes/node_composite_dilate.cc | 3 +- .../nodes/node_composite_directionalblur.cc | 3 +- .../nodes/node_composite_displace.cc | 3 +- .../nodes/node_composite_distance_matte.cc | 3 +- .../nodes/node_composite_double_edge_mask.cc | 3 +- .../nodes/node_composite_ellipsemask.cc | 3 +- .../nodes/node_composite_exposure.cc | 3 +- .../nodes/node_composite_file_output.cc | 3 +- .../composite/nodes/node_composite_filter.cc | 3 +- .../composite/nodes/node_composite_flip.cc | 3 +- .../composite/nodes/node_composite_gamma.cc | 3 +- .../composite/nodes/node_composite_glare.cc | 3 +- .../nodes/node_composite_hue_sat_val.cc | 3 +- .../nodes/node_composite_huecorrect.cc | 3 +- .../composite/nodes/node_composite_id_mask.cc | 3 +- .../composite/nodes/node_composite_image.cc | 6 +- .../nodes/node_composite_image_info.cc | 3 +- .../composite/nodes/node_composite_inpaint.cc | 3 +- .../composite/nodes/node_composite_invert.cc | 3 +- .../composite/nodes/node_composite_keying.cc | 3 +- .../nodes/node_composite_keyingscreen.cc | 3 +- .../nodes/node_composite_kuwahara.cc | 3 +- .../nodes/node_composite_lensdist.cc | 3 +- .../composite/nodes/node_composite_levels.cc | 3 +- .../nodes/node_composite_luma_matte.cc | 3 +- .../nodes/node_composite_map_range.cc | 3 +- .../composite/nodes/node_composite_map_uv.cc | 3 +- .../nodes/node_composite_map_value.cc | 3 +- .../composite/nodes/node_composite_mask.cc | 3 +- .../composite/nodes/node_composite_math.cc | 3 +- .../composite/nodes/node_composite_mixrgb.cc | 3 +- .../nodes/node_composite_movieclip.cc | 3 +- .../nodes/node_composite_moviedistortion.cc | 3 +- .../composite/nodes/node_composite_normal.cc | 3 +- .../nodes/node_composite_normalize.cc | 3 +- .../nodes/node_composite_pixelate.cc | 3 +- .../nodes/node_composite_planetrackdeform.cc | 3 +- .../nodes/node_composite_posterize.cc | 3 +- .../nodes/node_composite_premulkey.cc | 3 +- .../composite/nodes/node_composite_rgb.cc | 3 +- .../composite/nodes/node_composite_rotate.cc | 3 +- .../composite/nodes/node_composite_scale.cc | 3 +- .../nodes/node_composite_scene_time.cc | 3 +- .../nodes/node_composite_sepcomb_color.cc | 6 +- .../nodes/node_composite_sepcomb_hsva.cc | 6 +- .../nodes/node_composite_sepcomb_rgba.cc | 6 +- .../nodes/node_composite_sepcomb_xyz.cc | 6 +- .../nodes/node_composite_sepcomb_ycca.cc | 6 +- .../nodes/node_composite_sepcomb_yuva.cc | 6 +- .../nodes/node_composite_setalpha.cc | 3 +- .../composite/nodes/node_composite_split.cc | 3 +- .../nodes/node_composite_stabilize2d.cc | 3 +- .../nodes/node_composite_sunbeams.cc | 3 +- .../composite/nodes/node_composite_switch.cc | 3 +- .../nodes/node_composite_switchview.cc | 3 +- .../composite/nodes/node_composite_texture.cc | 3 +- .../composite/nodes/node_composite_tonemap.cc | 3 +- .../nodes/node_composite_trackpos.cc | 3 +- .../nodes/node_composite_transform.cc | 3 +- .../nodes/node_composite_translate.cc | 3 +- .../nodes/node_composite_val_to_rgb.cc | 6 +- .../composite/nodes/node_composite_value.cc | 3 +- .../nodes/node_composite_vec_blur.cc | 3 +- .../composite/nodes/node_composite_viewer.cc | 3 +- .../nodes/node_composite_zcombine.cc | 3 +- source/blender/nodes/intern/node_register.cc | 4 +- 97 files changed, 223 insertions(+), 334 deletions(-) delete mode 100644 source/blender/nodes/composite/node_composite_register.cc delete mode 100644 source/blender/nodes/composite/node_composite_register.hh diff --git a/source/blender/nodes/NOD_composite.hh b/source/blender/nodes/NOD_composite.hh index 0092f002eab..72dd64951fe 100644 --- a/source/blender/nodes/NOD_composite.hh +++ b/source/blender/nodes/NOD_composite.hh @@ -26,6 +26,9 @@ struct ViewLayer; extern blender::bke::bNodeTreeType *ntreeType_Composite; +void register_node_tree_type_cmp(); +void register_node_type_cmp_custom_group(blender::bke::bNodeType *ntype); + void node_cmp_rlayers_outputs(bNodeTree *ntree, bNode *node); void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, @@ -35,8 +38,6 @@ void node_cmp_rlayers_register_pass(bNodeTree *ntree, eNodeSocketDatatype type); const char *node_cmp_rlayers_sock_to_pass(int sock_index); -void register_node_type_cmp_custom_group(blender::bke::bNodeType *ntype); - /** * Called from render pipeline, to tag render input and output. * need to do all scenes, to prevent errors when you re-render 1 scene. diff --git a/source/blender/nodes/NOD_register.hh b/source/blender/nodes/NOD_register.hh index 381bf3b942c..276dfe74c56 100644 --- a/source/blender/nodes/NOD_register.hh +++ b/source/blender/nodes/NOD_register.hh @@ -12,7 +12,7 @@ void register_node_type_reroute(); void register_node_type_group_input(); void register_node_type_group_output(); -void register_composite_nodes(); +void register_compositor_nodes(); void register_function_nodes(); void register_geometry_nodes(); void register_shader_nodes(); diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index 07a9ae60ab6..22ed96deb50 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -113,11 +113,9 @@ set(SRC nodes/node_composite_viewer.cc nodes/node_composite_zcombine.cc - node_composite_register.cc node_composite_tree.cc node_composite_util.cc - node_composite_register.hh node_composite_util.hh ) @@ -138,6 +136,17 @@ set(LIB PRIVATE bf::dependencies::optional::opencolorio ) +add_node_discovery( + bf_nodes_compositor_generated + "${SRC}" + ${CMAKE_CURRENT_BINARY_DIR}/register_compositor_nodes.cc + register_compositor_nodes +) + +list(APPEND LIB + bf_nodes_compositor_generated +) + if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_IMAGE_OPENEXR) endif() @@ -167,6 +176,7 @@ if(WITH_FFTW3) endif() blender_add_lib(bf_nodes_composite "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") +target_link_libraries(bf_nodes_compositor_generated bf_nodes_composite) blender_set_target_unity_build(bf_nodes_composite 10) diff --git a/source/blender/nodes/composite/node_composite_register.cc b/source/blender/nodes/composite/node_composite_register.cc deleted file mode 100644 index 8c3a0ec1c2f..00000000000 --- a/source/blender/nodes/composite/node_composite_register.cc +++ /dev/null @@ -1,115 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "NOD_register.hh" - -#include "node_composite_register.hh" - -void register_composite_nodes() -{ - register_node_tree_type_cmp(); - - register_node_type_cmp_group(); - - register_node_type_cmp_alphaover(); - register_node_type_cmp_antialiasing(); - register_node_type_cmp_bilateralblur(); - register_node_type_cmp_blur(); - register_node_type_cmp_bokehblur(); - register_node_type_cmp_bokehimage(); - register_node_type_cmp_boxmask(); - register_node_type_cmp_brightcontrast(); - register_node_type_cmp_channel_matte(); - register_node_type_cmp_chroma_matte(); - register_node_type_cmp_color_matte(); - register_node_type_cmp_color_spill(); - register_node_type_cmp_colorbalance(); - register_node_type_cmp_colorcorrection(); - register_node_type_cmp_combhsva(); - register_node_type_cmp_combine_color(); - register_node_type_cmp_combine_xyz(); - register_node_type_cmp_combrgba(); - register_node_type_cmp_combycca(); - register_node_type_cmp_combyuva(); - register_node_type_cmp_composite(); - register_node_type_cmp_convert_color_space(); - register_node_type_cmp_cornerpin(); - register_node_type_cmp_crop(); - register_node_type_cmp_cryptomatte_legacy(); - register_node_type_cmp_cryptomatte(); - register_node_type_cmp_curve_rgb(); - register_node_type_cmp_curve_time(); - register_node_type_cmp_curve_vec(); - register_node_type_cmp_dblur(); - register_node_type_cmp_defocus(); - register_node_type_cmp_denoise(); - register_node_type_cmp_despeckle(); - register_node_type_cmp_diff_matte(); - register_node_type_cmp_dilateerode(); - register_node_type_cmp_displace(); - register_node_type_cmp_distance_matte(); - register_node_type_cmp_doubleedgemask(); - register_node_type_cmp_ellipsemask(); - register_node_type_cmp_exposure(); - register_node_type_cmp_filter(); - register_node_type_cmp_flip(); - register_node_type_cmp_gamma(); - register_node_type_cmp_glare(); - register_node_type_cmp_hue_sat(); - register_node_type_cmp_huecorrect(); - register_node_type_cmp_idmask(); - register_node_type_cmp_image(); - register_node_type_cmp_image_info(); - register_node_type_cmp_inpaint(); - register_node_type_cmp_invert(); - register_node_type_cmp_keying(); - register_node_type_cmp_keyingscreen(); - register_node_type_cmp_kuwahara(); - register_node_type_cmp_lensdist(); - register_node_type_cmp_luma_matte(); - register_node_type_cmp_map_range(); - register_node_type_cmp_map_value(); - register_node_type_cmp_mapuv(); - register_node_type_cmp_mask(); - register_node_type_cmp_math(); - register_node_type_cmp_mix_rgb(); - register_node_type_cmp_movieclip(); - register_node_type_cmp_moviedistortion(); - register_node_type_cmp_normal(); - register_node_type_cmp_normalize(); - register_node_type_cmp_output_file(); - register_node_type_cmp_pixelate(); - register_node_type_cmp_planetrackdeform(); - register_node_type_cmp_posterize(); - register_node_type_cmp_premulkey(); - register_node_type_cmp_rgb(); - register_node_type_cmp_rgbtobw(); - register_node_type_cmp_rlayers(); - register_node_type_cmp_rotate(); - register_node_type_cmp_scale(); - register_node_type_cmp_scene_time(); - register_node_type_cmp_separate_color(); - register_node_type_cmp_separate_xyz(); - register_node_type_cmp_sephsva(); - register_node_type_cmp_seprgba(); - register_node_type_cmp_sepycca(); - register_node_type_cmp_sepyuva(); - register_node_type_cmp_setalpha(); - register_node_type_cmp_split(); - register_node_type_cmp_stabilize2d(); - register_node_type_cmp_sunbeams(); - register_node_type_cmp_switch_view(); - register_node_type_cmp_switch(); - register_node_type_cmp_texture(); - register_node_type_cmp_tonemap(); - register_node_type_cmp_trackpos(); - register_node_type_cmp_transform(); - register_node_type_cmp_translate(); - register_node_type_cmp_valtorgb(); - register_node_type_cmp_value(); - register_node_type_cmp_vecblur(); - register_node_type_cmp_view_levels(); - register_node_type_cmp_viewer(); - register_node_type_cmp_zcombine(); -} diff --git a/source/blender/nodes/composite/node_composite_register.hh b/source/blender/nodes/composite/node_composite_register.hh deleted file mode 100644 index 2b4d6e10668..00000000000 --- a/source/blender/nodes/composite/node_composite_register.hh +++ /dev/null @@ -1,110 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -void register_node_tree_type_cmp(); - -void register_node_type_cmp_group(); - -void register_node_type_cmp_alphaover(); -void register_node_type_cmp_antialiasing(); -void register_node_type_cmp_bilateralblur(); -void register_node_type_cmp_blur(); -void register_node_type_cmp_bokehblur(); -void register_node_type_cmp_bokehimage(); -void register_node_type_cmp_boxmask(); -void register_node_type_cmp_brightcontrast(); -void register_node_type_cmp_channel_matte(); -void register_node_type_cmp_chroma_matte(); -void register_node_type_cmp_color_matte(); -void register_node_type_cmp_color_spill(); -void register_node_type_cmp_colorbalance(); -void register_node_type_cmp_colorcorrection(); -void register_node_type_cmp_combhsva(); -void register_node_type_cmp_combine_color(); -void register_node_type_cmp_combine_xyz(); -void register_node_type_cmp_combrgba(); -void register_node_type_cmp_combycca(); -void register_node_type_cmp_combyuva(); -void register_node_type_cmp_composite(); -void register_node_type_cmp_convert_color_space(); -void register_node_type_cmp_cornerpin(); -void register_node_type_cmp_crop(); -void register_node_type_cmp_cryptomatte_legacy(); -void register_node_type_cmp_cryptomatte(); -void register_node_type_cmp_curve_rgb(); -void register_node_type_cmp_curve_time(); -void register_node_type_cmp_curve_vec(); -void register_node_type_cmp_dblur(); -void register_node_type_cmp_defocus(); -void register_node_type_cmp_denoise(); -void register_node_type_cmp_despeckle(); -void register_node_type_cmp_diff_matte(); -void register_node_type_cmp_dilateerode(); -void register_node_type_cmp_displace(); -void register_node_type_cmp_distance_matte(); -void register_node_type_cmp_doubleedgemask(); -void register_node_type_cmp_ellipsemask(); -void register_node_type_cmp_exposure(); -void register_node_type_cmp_filter(); -void register_node_type_cmp_flip(); -void register_node_type_cmp_gamma(); -void register_node_type_cmp_glare(); -void register_node_type_cmp_hue_sat(); -void register_node_type_cmp_huecorrect(); -void register_node_type_cmp_idmask(); -void register_node_type_cmp_image(); -void register_node_type_cmp_image_info(); -void register_node_type_cmp_inpaint(); -void register_node_type_cmp_invert(); -void register_node_type_cmp_keying(); -void register_node_type_cmp_keyingscreen(); -void register_node_type_cmp_kuwahara(); -void register_node_type_cmp_lensdist(); -void register_node_type_cmp_luma_matte(); -void register_node_type_cmp_map_range(); -void register_node_type_cmp_map_value(); -void register_node_type_cmp_mapuv(); -void register_node_type_cmp_mask(); -void register_node_type_cmp_math(); -void register_node_type_cmp_mix_rgb(); -void register_node_type_cmp_movieclip(); -void register_node_type_cmp_moviedistortion(); -void register_node_type_cmp_normal(); -void register_node_type_cmp_normalize(); -void register_node_type_cmp_output_file(); -void register_node_type_cmp_pixelate(); -void register_node_type_cmp_planetrackdeform(); -void register_node_type_cmp_posterize(); -void register_node_type_cmp_premulkey(); -void register_node_type_cmp_rgb(); -void register_node_type_cmp_rgbtobw(); -void register_node_type_cmp_rlayers(); -void register_node_type_cmp_rotate(); -void register_node_type_cmp_scale(); -void register_node_type_cmp_scene_time(); -void register_node_type_cmp_separate_color(); -void register_node_type_cmp_separate_xyz(); -void register_node_type_cmp_sephsva(); -void register_node_type_cmp_seprgba(); -void register_node_type_cmp_sepycca(); -void register_node_type_cmp_sepyuva(); -void register_node_type_cmp_setalpha(); -void register_node_type_cmp_split(); -void register_node_type_cmp_stabilize2d(); -void register_node_type_cmp_sunbeams(); -void register_node_type_cmp_switch_view(); -void register_node_type_cmp_switch(); -void register_node_type_cmp_texture(); -void register_node_type_cmp_tonemap(); -void register_node_type_cmp_trackpos(); -void register_node_type_cmp_transform(); -void register_node_type_cmp_translate(); -void register_node_type_cmp_valtorgb(); -void register_node_type_cmp_value(); -void register_node_type_cmp_vecblur(); -void register_node_type_cmp_view_levels(); -void register_node_type_cmp_viewer(); -void register_node_type_cmp_zcombine(); diff --git a/source/blender/nodes/composite/node_composite_util.hh b/source/blender/nodes/composite/node_composite_util.hh index 1a9a9b48706..4ca43c7efeb 100644 --- a/source/blender/nodes/composite/node_composite_util.hh +++ b/source/blender/nodes/composite/node_composite_util.hh @@ -15,10 +15,10 @@ #include "BKE_node_legacy_types.hh" // IWYU pragma: export -#include "node_composite_register.hh" // IWYU pragma: export -#include "node_util.hh" // IWYU pragma: export +#include "node_util.hh" // IWYU pragma: export #include "NOD_composite.hh" // IWYU pragma: export +#include "NOD_register.hh" // IWYU pragma: export #include "NOD_socket.hh" // IWYU pragma: export #include "NOD_socket_declarations.hh" // IWYU pragma: export #include "NOD_socket_search_link.hh" 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 4af5bf312d8..e1c56c64a5c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc @@ -97,7 +97,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_alpha_over_cc -void register_node_type_cmp_alphaover() +static void register_node_type_cmp_alphaover() { namespace file_ns = blender::nodes::node_composite_alpha_over_cc; @@ -117,3 +117,4 @@ void register_node_type_cmp_alphaover() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_alphaover) diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc index b24924d0d11..6905ffbfeaf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc +++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc @@ -106,7 +106,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_antialiasing_cc -void register_node_type_cmp_antialiasing() +static void register_node_type_cmp_antialiasing() { namespace file_ns = blender::nodes::node_composite_antialiasing_cc; @@ -127,3 +127,4 @@ void register_node_type_cmp_antialiasing() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_antialiasing) diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index d18aef7d1cd..73677301c4d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -175,7 +175,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_bilateralblur_cc -void register_node_type_cmp_bilateralblur() +static void register_node_type_cmp_bilateralblur() { namespace file_ns = blender::nodes::node_composite_bilateralblur_cc; @@ -194,3 +194,4 @@ void register_node_type_cmp_bilateralblur() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_bilateralblur) diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 2c8a077fcbd..27b72e42438 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -500,7 +500,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_blur_cc -void register_node_type_cmp_blur() +static void register_node_type_cmp_blur() { namespace file_ns = blender::nodes::node_composite_blur_cc; @@ -521,3 +521,4 @@ void register_node_type_cmp_blur() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_blur) diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index 0111c1ed297..2193a80fc02 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -376,7 +376,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_bokehblur_cc -void register_node_type_cmp_bokehblur() +static void register_node_type_cmp_bokehblur() { namespace file_ns = blender::nodes::node_composite_bokehblur_cc; @@ -394,3 +394,4 @@ void register_node_type_cmp_bokehblur() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_bokehblur) diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index 9b960d0aa07..3ff1a2c795a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -131,7 +131,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_bokehimage_cc -void register_node_type_cmp_bokehimage() +static void register_node_type_cmp_bokehimage() { namespace file_ns = blender::nodes::node_composite_bokehimage_cc; @@ -151,3 +151,4 @@ void register_node_type_cmp_bokehimage() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_bokehimage) diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc index 20eb611e665..d40f659678e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc @@ -284,7 +284,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_boxmask_cc -void register_node_type_cmp_boxmask() +static void register_node_type_cmp_boxmask() { namespace file_ns = blender::nodes::node_composite_boxmask_cc; @@ -304,3 +304,4 @@ void register_node_type_cmp_boxmask() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_boxmask) diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index 5b7e1e8d157..95d6cd98a9d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -82,7 +82,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_brightness_cc -void register_node_type_cmp_brightcontrast() +static void register_node_type_cmp_brightcontrast() { namespace file_ns = blender::nodes::node_composite_brightness_cc; @@ -99,3 +99,4 @@ void register_node_type_cmp_brightcontrast() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_brightcontrast) 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 9c6c27779ab..a3c0c8ffce6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc @@ -268,7 +268,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_channel_matte_cc -void register_node_type_cmp_channel_matte() +static void register_node_type_cmp_channel_matte() { namespace file_ns = blender::nodes::node_composite_channel_matte_cc; @@ -290,3 +290,4 @@ void register_node_type_cmp_channel_matte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_channel_matte) 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 a0b8072d1a3..0171621e2fd 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc @@ -141,7 +141,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_chroma_matte_cc -void register_node_type_cmp_chroma_matte() +static void register_node_type_cmp_chroma_matte() { namespace file_ns = blender::nodes::node_composite_chroma_matte_cc; @@ -162,3 +162,4 @@ void register_node_type_cmp_chroma_matte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_chroma_matte) 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 cd0fb1a503a..2535b5cda88 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc @@ -126,7 +126,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_color_matte_cc -void register_node_type_cmp_color_matte() +static void register_node_type_cmp_color_matte() { namespace file_ns = blender::nodes::node_composite_color_matte_cc; @@ -147,3 +147,4 @@ void register_node_type_cmp_color_matte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_color_matte) 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 01eaab60568..a3d6d9cee6a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc @@ -182,7 +182,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_color_spill_cc -void register_node_type_cmp_color_spill() +static void register_node_type_cmp_color_spill() { namespace file_ns = blender::nodes::node_composite_color_spill_cc; @@ -204,3 +204,4 @@ void register_node_type_cmp_color_spill() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_color_spill) diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index 239418d968f..6ce28e8f4f0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -365,7 +365,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_colorbalance_cc -void register_node_type_cmp_colorbalance() +static void register_node_type_cmp_colorbalance() { namespace file_ns = blender::nodes::node_composite_colorbalance_cc; @@ -388,3 +388,4 @@ void register_node_type_cmp_colorbalance() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_colorbalance) diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 4f2d11a1f75..72667fce898 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -405,7 +405,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_colorcorrection_cc -void register_node_type_cmp_colorcorrection() +static void register_node_type_cmp_colorcorrection() { namespace file_ns = blender::nodes::node_composite_colorcorrection_cc; @@ -427,3 +427,4 @@ void register_node_type_cmp_colorcorrection() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_colorcorrection) diff --git a/source/blender/nodes/composite/nodes/node_composite_common.cc b/source/blender/nodes/composite/nodes/node_composite_common.cc index 3f9bb24ed9f..16e6a7f470a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_common.cc +++ b/source/blender/nodes/composite/nodes/node_composite_common.cc @@ -16,7 +16,7 @@ #include "RNA_access.hh" -void register_node_type_cmp_group() +static void register_node_type_cmp_group() { static blender::bke::bNodeType ntype; @@ -41,6 +41,7 @@ void register_node_type_cmp_group() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_group) void register_node_type_cmp_custom_group(blender::bke::bNodeType *ntype) { diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc index ecebd97696a..1133a82469e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.cc +++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc @@ -140,7 +140,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_composite_cc -void register_node_type_cmp_composite() +static void register_node_type_cmp_composite() { namespace file_ns = blender::nodes::node_composite_composite_cc; @@ -157,3 +157,4 @@ void register_node_type_cmp_composite() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_composite) 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 e46211a94a1..085cd1f388d 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 @@ -190,7 +190,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_convert_color_space_cc -void register_node_type_cmp_convert_color_space() +static void register_node_type_cmp_convert_color_space() { namespace file_ns = blender::nodes::node_composite_convert_color_space_cc; static blender::bke::bNodeType ntype; @@ -210,3 +210,4 @@ void register_node_type_cmp_convert_color_space() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_convert_color_space) diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc index 910e8dc2d26..0c771b02251 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc @@ -314,7 +314,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_cornerpin_cc -void register_node_type_cmp_cornerpin() +static void register_node_type_cmp_cornerpin() { namespace file_ns = blender::nodes::node_composite_cornerpin_cc; @@ -332,3 +332,4 @@ void register_node_type_cmp_cornerpin() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_cornerpin) diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc index c39df19005f..fd15357dbe4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_crop.cc +++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc @@ -287,7 +287,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_crop_cc -void register_node_type_cmp_crop() +static void register_node_type_cmp_crop() { namespace file_ns = blender::nodes::node_composite_crop_cc; @@ -309,3 +309,4 @@ void register_node_type_cmp_crop() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_crop) diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index cb7913a3b91..8f8de12bf53 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -910,7 +910,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_cryptomatte_cc -void register_node_type_cmp_cryptomatte() +static void register_node_type_cmp_cryptomatte() { namespace file_ns = blender::nodes::node_composite_cryptomatte_cc; @@ -934,6 +934,7 @@ void register_node_type_cmp_cryptomatte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_cryptomatte) /** \} */ @@ -1021,7 +1022,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_legacy_cryptomatte_cc -void register_node_type_cmp_cryptomatte_legacy() +static void register_node_type_cmp_cryptomatte_legacy() { namespace legacy_file_ns = blender::nodes::node_composite_legacy_cryptomatte_cc; namespace file_ns = blender::nodes::node_composite_cryptomatte_cc; @@ -1042,5 +1043,6 @@ void register_node_type_cmp_cryptomatte_legacy() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_cryptomatte_legacy) /** \} */ diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc index 2eeae126d6a..f5137b47654 100644 --- a/source/blender/nodes/composite/nodes/node_composite_curves.cc +++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc @@ -102,7 +102,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_time_curves_cc -void register_node_type_cmp_curve_time() +static void register_node_type_cmp_curve_time() { namespace file_ns = blender::nodes::node_composite_time_curves_cc; @@ -123,6 +123,7 @@ void register_node_type_cmp_curve_time() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_curve_time) /* **************** CURVE VEC ******************** */ @@ -210,7 +211,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_vector_curves_cc -void register_node_type_cmp_curve_vec() +static void register_node_type_cmp_curve_vec() { namespace file_ns = blender::nodes::node_composite_vector_curves_cc; @@ -232,6 +233,7 @@ void register_node_type_cmp_curve_vec() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_curve_vec) /* **************** CURVE RGB ******************** */ @@ -374,7 +376,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_rgb_curves_cc -void register_node_type_cmp_curve_rgb() +static void register_node_type_cmp_curve_rgb() { namespace file_ns = blender::nodes::node_composite_rgb_curves_cc; @@ -394,3 +396,4 @@ void register_node_type_cmp_curve_rgb() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_curve_rgb) diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc index 7c50dc2e715..3d3bbb0ed3c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc @@ -543,7 +543,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_defocus_cc -void register_node_type_cmp_defocus() +static void register_node_type_cmp_defocus() { namespace file_ns = blender::nodes::node_composite_defocus_cc; @@ -563,3 +563,4 @@ void register_node_type_cmp_defocus() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_defocus) diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc index ee37cefd12a..60f057ce0c3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc +++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc @@ -348,7 +348,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_denoise_cc -void register_node_type_cmp_denoise() +static void register_node_type_cmp_denoise() { namespace file_ns = blender::nodes::node_composite_denoise_cc; @@ -368,3 +368,4 @@ void register_node_type_cmp_denoise() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_denoise) diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc index 61be6df398c..e595ecf87ea 100644 --- a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc +++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc @@ -201,7 +201,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_despeckle_cc -void register_node_type_cmp_despeckle() +static void register_node_type_cmp_despeckle() { namespace file_ns = blender::nodes::node_composite_despeckle_cc; @@ -220,3 +220,4 @@ void register_node_type_cmp_despeckle() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_despeckle) 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 808bbecf40a..3fe1069e514 100644 --- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc @@ -96,7 +96,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_diff_matte_cc -void register_node_type_cmp_diff_matte() +static void register_node_type_cmp_diff_matte() { namespace file_ns = blender::nodes::node_composite_diff_matte_cc; @@ -119,3 +119,4 @@ void register_node_type_cmp_diff_matte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_diff_matte) diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc index 9534e04821b..27658034968 100644 --- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc @@ -569,7 +569,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_dilate_cc -void register_node_type_cmp_dilateerode() +static void register_node_type_cmp_dilateerode() { namespace file_ns = blender::nodes::node_composite_dilate_cc; @@ -590,3 +590,4 @@ void register_node_type_cmp_dilateerode() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_dilateerode) diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc index 734d6227a49..1d93aff85cb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc @@ -304,7 +304,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_directionalblur_cc -void register_node_type_cmp_dblur() +static void register_node_type_cmp_dblur() { namespace file_ns = blender::nodes::node_composite_directionalblur_cc; @@ -323,3 +323,4 @@ void register_node_type_cmp_dblur() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_dblur) diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.cc b/source/blender/nodes/composite/nodes/node_composite_displace.cc index 40acfa7e25b..6cff0601a58 100644 --- a/source/blender/nodes/composite/nodes/node_composite_displace.cc +++ b/source/blender/nodes/composite/nodes/node_composite_displace.cc @@ -215,7 +215,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_displace_cc -void register_node_type_cmp_displace() +static void register_node_type_cmp_displace() { namespace file_ns = blender::nodes::node_composite_displace_cc; @@ -231,3 +231,4 @@ void register_node_type_cmp_displace() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_displace) 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 7f2566b60ba..af144b98551 100644 --- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc @@ -167,7 +167,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_distance_matte_cc -void register_node_type_cmp_distance_matte() +static void register_node_type_cmp_distance_matte() { namespace file_ns = blender::nodes::node_composite_distance_matte_cc; @@ -189,3 +189,4 @@ void register_node_type_cmp_distance_matte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_distance_matte) 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 27c9029cdf8..4a1f0dac9dd 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 @@ -314,7 +314,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_double_edge_mask_cc -void register_node_type_cmp_doubleedgemask() +static void register_node_type_cmp_doubleedgemask() { namespace file_ns = blender::nodes::node_composite_double_edge_mask_cc; @@ -331,3 +331,4 @@ void register_node_type_cmp_doubleedgemask() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_doubleedgemask) diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc index e80177d90b5..40694cde89d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc @@ -288,7 +288,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_ellipsemask_cc -void register_node_type_cmp_ellipsemask() +static void register_node_type_cmp_ellipsemask() { namespace file_ns = blender::nodes::node_composite_ellipsemask_cc; @@ -309,3 +309,4 @@ void register_node_type_cmp_ellipsemask() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_ellipsemask) diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc index a260f29bae7..0545ba3b6b9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc +++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc @@ -55,7 +55,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_exposure_cc -void register_node_type_cmp_exposure() +static void register_node_type_cmp_exposure() { namespace file_ns = blender::nodes::node_composite_exposure_cc; @@ -72,3 +72,4 @@ void register_node_type_cmp_exposure() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_exposure) diff --git a/source/blender/nodes/composite/nodes/node_composite_file_output.cc b/source/blender/nodes/composite/nodes/node_composite_file_output.cc index 03589c29ed6..e98f7b50f8f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_file_output.cc +++ b/source/blender/nodes/composite/nodes/node_composite_file_output.cc @@ -1019,7 +1019,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_file_output_cc -void register_node_type_cmp_output_file() +static void register_node_type_cmp_output_file() { namespace file_ns = blender::nodes::node_composite_file_output_cc; @@ -1041,3 +1041,4 @@ void register_node_type_cmp_output_file() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_output_file) diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.cc b/source/blender/nodes/composite/nodes/node_composite_filter.cc index d0847861423..de75071aec5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_filter.cc +++ b/source/blender/nodes/composite/nodes/node_composite_filter.cc @@ -241,7 +241,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_filter_cc -void register_node_type_cmp_filter() +static void register_node_type_cmp_filter() { namespace file_ns = blender::nodes::node_composite_filter_cc; @@ -260,3 +260,4 @@ void register_node_type_cmp_filter() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_filter) diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc index d83b9f71ec1..9344b9c48b0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_flip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc @@ -121,7 +121,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_flip_cc -void register_node_type_cmp_flip() +static void register_node_type_cmp_flip() { namespace file_ns = blender::nodes::node_composite_flip_cc; @@ -138,3 +138,4 @@ void register_node_type_cmp_flip() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_flip) diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.cc b/source/blender/nodes/composite/nodes/node_composite_gamma.cc index 137c20fa467..c799946e1be 100644 --- a/source/blender/nodes/composite/nodes/node_composite_gamma.cc +++ b/source/blender/nodes/composite/nodes/node_composite_gamma.cc @@ -63,7 +63,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_gamma_cc -void register_node_type_cmp_gamma() +static void register_node_type_cmp_gamma() { namespace file_ns = blender::nodes::node_composite_gamma_cc; @@ -80,3 +80,4 @@ void register_node_type_cmp_gamma() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_gamma) diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.cc b/source/blender/nodes/composite/nodes/node_composite_glare.cc index a17329a1899..3d51fb80519 100644 --- a/source/blender/nodes/composite/nodes/node_composite_glare.cc +++ b/source/blender/nodes/composite/nodes/node_composite_glare.cc @@ -2409,7 +2409,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_glare_cc -void register_node_type_cmp_glare() +static void register_node_type_cmp_glare() { namespace file_ns = blender::nodes::node_composite_glare_cc; @@ -2430,3 +2430,4 @@ void register_node_type_cmp_glare() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_glare) 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 e2aa2cb31d1..133fc921078 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 @@ -95,7 +95,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_hue_sat_val_cc -void register_node_type_cmp_hue_sat() +static void register_node_type_cmp_hue_sat() { namespace file_ns = blender::nodes::node_composite_hue_sat_val_cc; @@ -112,3 +112,4 @@ void register_node_type_cmp_hue_sat() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_hue_sat) diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc index 19100cc56f5..2468102e1d0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc +++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc @@ -139,7 +139,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_huecorrect_cc -void register_node_type_cmp_huecorrect() +static void register_node_type_cmp_huecorrect() { namespace file_ns = blender::nodes::node_composite_huecorrect_cc; @@ -159,3 +159,4 @@ void register_node_type_cmp_huecorrect() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_huecorrect) 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 fdc6b70479f..864f71eefc4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc @@ -130,7 +130,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_id_mask_cc -void register_node_type_cmp_idmask() +static void register_node_type_cmp_idmask() { namespace file_ns = blender::nodes::node_composite_id_mask_cc; @@ -146,3 +146,4 @@ void register_node_type_cmp_idmask() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_idmask) diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc index f2da1c39a77..20138be1406 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image.cc @@ -533,7 +533,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_image_cc -void register_node_type_cmp_image() +static void register_node_type_cmp_image() { namespace file_ns = blender::nodes::node_composite_image_cc; @@ -554,6 +554,7 @@ void register_node_type_cmp_image() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_image) /* **************** RENDER RESULT ******************** */ @@ -856,7 +857,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_render_layer_cc -void register_node_type_cmp_rlayers() +static void register_node_type_cmp_rlayers() { namespace file_ns = blender::nodes::node_composite_render_layer_cc; @@ -885,3 +886,4 @@ void register_node_type_cmp_rlayers() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_rlayers) diff --git a/source/blender/nodes/composite/nodes/node_composite_image_info.cc b/source/blender/nodes/composite/nodes/node_composite_image_info.cc index 8dff96e1044..7683c7f6ba3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image_info.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image_info.cc @@ -134,7 +134,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_image_info_cc -void register_node_type_cmp_image_info() +static void register_node_type_cmp_image_info() { namespace file_ns = blender::nodes::node_composite_image_info_cc; @@ -149,3 +149,4 @@ void register_node_type_cmp_image_info() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_image_info) diff --git a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc index c67564a462d..d161183255b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc +++ b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc @@ -357,7 +357,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_inpaint_cc -void register_node_type_cmp_inpaint() +static void register_node_type_cmp_inpaint() { namespace file_ns = blender::nodes::node_composite_inpaint_cc; @@ -373,3 +373,4 @@ void register_node_type_cmp_inpaint() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_inpaint) diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc index a77d169a5c5..295228e1ab2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_invert.cc +++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc @@ -73,7 +73,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_invert_cc -void register_node_type_cmp_invert() +static void register_node_type_cmp_invert() { namespace file_ns = blender::nodes::node_composite_invert_cc; @@ -90,3 +90,4 @@ void register_node_type_cmp_invert() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_invert) diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.cc b/source/blender/nodes/composite/nodes/node_composite_keying.cc index aee30b6fcb3..cf55ed0dc71 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keying.cc @@ -809,7 +809,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_keying_cc -void register_node_type_cmp_keying() +static void register_node_type_cmp_keying() { namespace file_ns = blender::nodes::node_composite_keying_cc; @@ -830,3 +830,4 @@ void register_node_type_cmp_keying() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_keying) diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc index f9fa7b07c9b..bb6f8f7621a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc @@ -169,7 +169,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_keyingscreen_cc -void register_node_type_cmp_keyingscreen() +static void register_node_type_cmp_keyingscreen() { namespace file_ns = blender::nodes::node_composite_keyingscreen_cc; @@ -189,3 +189,4 @@ void register_node_type_cmp_keyingscreen() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_keyingscreen) diff --git a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc index 0604290129c..45b2083b42d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc +++ b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc @@ -829,7 +829,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_kuwahara_cc -void register_node_type_cmp_kuwahara() +static void register_node_type_cmp_kuwahara() { namespace file_ns = blender::nodes::node_composite_kuwahara_cc; @@ -851,3 +851,4 @@ void register_node_type_cmp_kuwahara() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_kuwahara) diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc index 78a119838be..de95a491ea1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc +++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc @@ -531,7 +531,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_lensdist_cc -void register_node_type_cmp_lensdist() +static void register_node_type_cmp_lensdist() { namespace file_ns = blender::nodes::node_composite_lensdist_cc; @@ -552,3 +552,4 @@ void register_node_type_cmp_lensdist() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_lensdist) diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc index 1cbfe405663..321c2a29b4b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_levels.cc +++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc @@ -192,7 +192,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_levels_cc -void register_node_type_cmp_view_levels() +static void register_node_type_cmp_view_levels() { namespace file_ns = blender::nodes::node_composite_levels_cc; @@ -211,3 +211,4 @@ void register_node_type_cmp_view_levels() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_view_levels) 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 fd107fec003..3d3ad6a73b9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc @@ -98,7 +98,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_luma_matte_cc -void register_node_type_cmp_luma_matte() +static void register_node_type_cmp_luma_matte() { namespace file_ns = blender::nodes::node_composite_luma_matte_cc; @@ -119,3 +119,4 @@ void register_node_type_cmp_luma_matte() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_luma_matte) 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 ef60ac54f20..969ab776ea5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc @@ -153,7 +153,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_map_range_cc -void register_node_type_cmp_map_range() +static void register_node_type_cmp_map_range() { namespace file_ns = blender::nodes::node_composite_map_range_cc; @@ -172,3 +172,4 @@ void register_node_type_cmp_map_range() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_map_range) 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 96a9847ea3a..e52085f1d1b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc @@ -266,7 +266,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_map_uv_cc -void register_node_type_cmp_mapuv() +static void register_node_type_cmp_mapuv() { namespace file_ns = blender::nodes::node_composite_map_uv_cc; @@ -285,3 +285,4 @@ void register_node_type_cmp_mapuv() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_mapuv) 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 a874275db45..d935a1494a1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc @@ -176,7 +176,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_map_value_cc -void register_node_type_cmp_map_value() +static void register_node_type_cmp_map_value() { namespace file_ns = blender::nodes::node_composite_map_value_cc; @@ -198,3 +198,4 @@ void register_node_type_cmp_map_value() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_map_value) diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc index 49fe59cc499..9c17e2db587 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc @@ -205,7 +205,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_mask_cc -void register_node_type_cmp_mask() +static void register_node_type_cmp_mask() { namespace file_ns = blender::nodes::node_composite_mask_cc; @@ -227,3 +227,4 @@ void register_node_type_cmp_mask() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_mask) diff --git a/source/blender/nodes/composite/nodes/node_composite_math.cc b/source/blender/nodes/composite/nodes/node_composite_math.cc index 2b72ce8c9c2..47a07405af4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_math.cc +++ b/source/blender/nodes/composite/nodes/node_composite_math.cc @@ -83,7 +83,7 @@ static int node_gpu_material(GPUMaterial *material, } // namespace blender::nodes::node_composite_math_cc -void register_node_type_cmp_math() +static void register_node_type_cmp_math() { namespace file_ns = blender::nodes::node_composite_math_cc; @@ -103,3 +103,4 @@ void register_node_type_cmp_math() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_math) diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc index 580dc280160..b42faafa5c7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc @@ -205,7 +205,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_mixrgb_cc -void register_node_type_cmp_mix_rgb() +static void register_node_type_cmp_mix_rgb() { namespace file_ns = blender::nodes::node_composite_mixrgb_cc; @@ -225,3 +225,4 @@ void register_node_type_cmp_mix_rgb() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_mix_rgb) diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc index e7baabf82cb..795d5ee0446 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc @@ -260,7 +260,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_movieclip_cc -void register_node_type_cmp_movieclip() +static void register_node_type_cmp_movieclip() { namespace file_ns = blender::nodes::node_composite_movieclip_cc; @@ -283,3 +283,4 @@ void register_node_type_cmp_movieclip() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_movieclip) diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc index 91fd29acb7e..e100e3a5429 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc @@ -163,7 +163,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_moviedistortion_cc -void register_node_type_cmp_moviedistortion() +static void register_node_type_cmp_moviedistortion() { namespace file_ns = blender::nodes::node_composite_moviedistortion_cc; @@ -184,3 +184,4 @@ void register_node_type_cmp_moviedistortion() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_moviedistortion) diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.cc b/source/blender/nodes/composite/nodes/node_composite_normal.cc index 9dfcf3e8d1a..cf1caa8fb40 100644 --- a/source/blender/nodes/composite/nodes/node_composite_normal.cc +++ b/source/blender/nodes/composite/nodes/node_composite_normal.cc @@ -80,7 +80,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_normal_cc -void register_node_type_cmp_normal() +static void register_node_type_cmp_normal() { namespace file_ns = blender::nodes::node_composite_normal_cc; @@ -97,3 +97,4 @@ void register_node_type_cmp_normal() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_normal) diff --git a/source/blender/nodes/composite/nodes/node_composite_normalize.cc b/source/blender/nodes/composite/nodes/node_composite_normalize.cc index 00318f26f5a..6cd506508b9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_normalize.cc +++ b/source/blender/nodes/composite/nodes/node_composite_normalize.cc @@ -108,7 +108,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_normalize_cc -void register_node_type_cmp_normalize() +static void register_node_type_cmp_normalize() { namespace file_ns = blender::nodes::node_composite_normalize_cc; @@ -125,3 +125,4 @@ void register_node_type_cmp_normalize() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_normalize) diff --git a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc index fcf66926456..902d34f555b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc @@ -122,7 +122,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_pixelate_cc -void register_node_type_cmp_pixelate() +static void register_node_type_cmp_pixelate() { namespace file_ns = blender::nodes::node_composite_pixelate_cc; @@ -140,3 +140,4 @@ void register_node_type_cmp_pixelate() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_pixelate) diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc index 4147d2e0dba..a0e6da9babc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc @@ -449,7 +449,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_planetrackdeform_cc -void register_node_type_cmp_planetrackdeform() +static void register_node_type_cmp_planetrackdeform() { namespace file_ns = blender::nodes::node_composite_planetrackdeform_cc; @@ -470,3 +470,4 @@ void register_node_type_cmp_planetrackdeform() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_planetrackdeform) diff --git a/source/blender/nodes/composite/nodes/node_composite_posterize.cc b/source/blender/nodes/composite/nodes/node_composite_posterize.cc index 2b7ec2dee8b..62f36a0c235 100644 --- a/source/blender/nodes/composite/nodes/node_composite_posterize.cc +++ b/source/blender/nodes/composite/nodes/node_composite_posterize.cc @@ -60,7 +60,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_posterize_cc -void register_node_type_cmp_posterize() +static void register_node_type_cmp_posterize() { namespace file_ns = blender::nodes::node_composite_posterize_cc; @@ -78,3 +78,4 @@ void register_node_type_cmp_posterize() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_posterize) diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc index 89358eca781..1f5aee444a4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc +++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc @@ -88,7 +88,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_premulkey_cc -void register_node_type_cmp_premulkey() +static void register_node_type_cmp_premulkey() { namespace file_ns = blender::nodes::node_composite_premulkey_cc; @@ -106,3 +106,4 @@ void register_node_type_cmp_premulkey() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_premulkey) diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_rgb.cc index f1f1bf2dd8e..ecf7d02af12 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rgb.cc @@ -48,7 +48,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_rgb_cc -void register_node_type_cmp_rgb() +static void register_node_type_cmp_rgb() { namespace file_ns = blender::nodes::node_composite_rgb_cc; @@ -65,3 +65,4 @@ void register_node_type_cmp_rgb() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_rgb) diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.cc b/source/blender/nodes/composite/nodes/node_composite_rotate.cc index 126d7767959..4ac0be0d23d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rotate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rotate.cc @@ -87,7 +87,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_rotate_cc -void register_node_type_cmp_rotate() +static void register_node_type_cmp_rotate() { namespace file_ns = blender::nodes::node_composite_rotate_cc; @@ -105,3 +105,4 @@ void register_node_type_cmp_rotate() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_rotate) diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.cc b/source/blender/nodes/composite/nodes/node_composite_scale.cc index f778360756d..e57191872bf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scale.cc +++ b/source/blender/nodes/composite/nodes/node_composite_scale.cc @@ -328,7 +328,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_scale_cc -void register_node_type_cmp_scale() +static void register_node_type_cmp_scale() { namespace file_ns = blender::nodes::node_composite_scale_cc; @@ -349,3 +349,4 @@ void register_node_type_cmp_scale() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_scale) 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 f53f2ec08b8..afa0ed9415e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc +++ b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc @@ -59,7 +59,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes -void register_node_type_cmp_scene_time() +static void register_node_type_cmp_scene_time() { static blender::bke::bNodeType ntype; @@ -73,3 +73,4 @@ void register_node_type_cmp_scene_time() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_scene_time) 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 8824c2fce8a..d0a3c1de7ec 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc @@ -221,7 +221,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_separate_color_cc -void register_node_type_cmp_separate_color() +static void register_node_type_cmp_separate_color() { namespace file_ns = blender::nodes::node_composite_separate_color_cc; @@ -242,6 +242,7 @@ void register_node_type_cmp_separate_color() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_separate_color) /* **************** COMBINE COLOR ******************** */ @@ -436,7 +437,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_combine_color_cc -void register_node_type_cmp_combine_color() +static void register_node_type_cmp_combine_color() { namespace file_ns = blender::nodes::node_composite_combine_color_cc; @@ -457,3 +458,4 @@ void register_node_type_cmp_combine_color() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_combine_color) 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 f28a60b195f..cf870999ca0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc @@ -57,7 +57,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_separate_hsva_cc -void register_node_type_cmp_sephsva() +static void register_node_type_cmp_sephsva() { namespace file_ns = blender::nodes::node_composite_separate_hsva_cc; @@ -75,6 +75,7 @@ void register_node_type_cmp_sephsva() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_sephsva) /* **************** COMBINE HSVA ******************** */ @@ -133,7 +134,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_combine_hsva_cc -void register_node_type_cmp_combhsva() +static void register_node_type_cmp_combhsva() { namespace file_ns = blender::nodes::node_composite_combine_hsva_cc; @@ -151,3 +152,4 @@ void register_node_type_cmp_combhsva() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_combhsva) 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 7167d9d72ac..79254bf8d06 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc @@ -58,7 +58,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_separate_rgba_cc -void register_node_type_cmp_seprgba() +static void register_node_type_cmp_seprgba() { namespace file_ns = blender::nodes::node_composite_separate_rgba_cc; @@ -76,6 +76,7 @@ void register_node_type_cmp_seprgba() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_seprgba) /* **************** COMBINE RGBA ******************** */ @@ -131,7 +132,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_combine_rgba_cc -void register_node_type_cmp_combrgba() +static void register_node_type_cmp_combrgba() { namespace file_ns = blender::nodes::node_composite_combine_rgba_cc; @@ -149,3 +150,4 @@ void register_node_type_cmp_combrgba() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_combrgba) diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc index efb5b744211..1be38dd9b76 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc @@ -54,7 +54,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_separate_xyz_cc -void register_node_type_cmp_separate_xyz() +static void register_node_type_cmp_separate_xyz() { namespace file_ns = blender::nodes::node_composite_separate_xyz_cc; @@ -72,6 +72,7 @@ void register_node_type_cmp_separate_xyz() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_separate_xyz) /* **************** COMBINE XYZ ******************** */ @@ -107,7 +108,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_combine_xyz_cc -void register_node_type_cmp_combine_xyz() +static void register_node_type_cmp_combine_xyz() { namespace file_ns = blender::nodes::node_composite_combine_xyz_cc; @@ -125,3 +126,4 @@ void register_node_type_cmp_combine_xyz() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_combine_xyz) 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 035242efa09..a7461039b8c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc @@ -110,7 +110,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_separate_ycca_cc -void register_node_type_cmp_sepycca() +static void register_node_type_cmp_sepycca() { namespace file_ns = blender::nodes::node_composite_separate_ycca_cc; @@ -129,6 +129,7 @@ void register_node_type_cmp_sepycca() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_sepycca) /* **************** COMBINE YCCA ******************** */ @@ -252,7 +253,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_combine_ycca_cc -void register_node_type_cmp_combycca() +static void register_node_type_cmp_combycca() { namespace file_ns = blender::nodes::node_composite_combine_ycca_cc; @@ -271,3 +272,4 @@ void register_node_type_cmp_combycca() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_combycca) 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 a4b77703320..43a902f5af4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc @@ -57,7 +57,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_separate_yuva_cc -void register_node_type_cmp_sepyuva() +static void register_node_type_cmp_sepyuva() { namespace file_ns = blender::nodes::node_composite_separate_yuva_cc; @@ -75,6 +75,7 @@ void register_node_type_cmp_sepyuva() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_sepyuva) /* **************** COMBINE YUVA ******************** */ @@ -133,7 +134,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_combine_yuva_cc -void register_node_type_cmp_combyuva() +static void register_node_type_cmp_combyuva() { namespace file_ns = blender::nodes::node_composite_combine_yuva_cc; @@ -151,3 +152,4 @@ void register_node_type_cmp_combyuva() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_combyuva) diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index 341773ffb1d..59356d58e8a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -97,7 +97,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_setalpha_cc -void register_node_type_cmp_setalpha() +static void register_node_type_cmp_setalpha() { namespace file_ns = blender::nodes::node_composite_setalpha_cc; @@ -118,3 +118,4 @@ void register_node_type_cmp_setalpha() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_setalpha) diff --git a/source/blender/nodes/composite/nodes/node_composite_split.cc b/source/blender/nodes/composite/nodes/node_composite_split.cc index 09a8433ea9c..4c553ce2264 100644 --- a/source/blender/nodes/composite/nodes/node_composite_split.cc +++ b/source/blender/nodes/composite/nodes/node_composite_split.cc @@ -142,7 +142,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_split_cc -void register_node_type_cmp_split() +static void register_node_type_cmp_split() { namespace file_ns = blender::nodes::node_composite_split_cc; @@ -164,3 +164,4 @@ void register_node_type_cmp_split() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_split) diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc index 34812dad53a..ec752f93f53 100644 --- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc +++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc @@ -140,7 +140,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_stabilize2d_cc -void register_node_type_cmp_stabilize2d() +static void register_node_type_cmp_stabilize2d() { namespace file_ns = blender::nodes::node_composite_stabilize2d_cc; @@ -158,3 +158,4 @@ void register_node_type_cmp_stabilize2d() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_stabilize2d) diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc index 28eca8f6701..11be6eec36a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc @@ -175,7 +175,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_sunbeams_cc -void register_node_type_cmp_sunbeams() +static void register_node_type_cmp_sunbeams() { namespace file_ns = blender::nodes::node_composite_sunbeams_cc; @@ -194,3 +194,4 @@ void register_node_type_cmp_sunbeams() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_sunbeams) diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.cc b/source/blender/nodes/composite/nodes/node_composite_switch.cc index d8f8d78afbd..f39c9b1decc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switch.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switch.cc @@ -52,7 +52,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_switch_cc -void register_node_type_cmp_switch() +static void register_node_type_cmp_switch() { namespace file_ns = blender::nodes::node_composite_switch_cc; @@ -69,3 +69,4 @@ void register_node_type_cmp_switch() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_switch) diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.cc b/source/blender/nodes/composite/nodes/node_composite_switchview.cc index e4cc458a96b..c632c42270f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switchview.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switchview.cc @@ -82,7 +82,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_switchview_cc -void register_node_type_cmp_switch_view() +static void register_node_type_cmp_switch_view() { namespace file_ns = blender::nodes::node_composite_switchview_cc; @@ -99,3 +99,4 @@ void register_node_type_cmp_switch_view() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_switch_view) diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.cc b/source/blender/nodes/composite/nodes/node_composite_texture.cc index 2e0ace1e9ee..01e78bd9bd9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_texture.cc +++ b/source/blender/nodes/composite/nodes/node_composite_texture.cc @@ -103,7 +103,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_texture_cc -void register_node_type_cmp_texture() +static void register_node_type_cmp_texture() { namespace file_ns = blender::nodes::node_composite_texture_cc; @@ -122,3 +122,4 @@ void register_node_type_cmp_texture() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_texture) diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc index bf9c92beceb..0f566587222 100644 --- a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc +++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc @@ -483,7 +483,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_tonemap_cc -void register_node_type_cmp_tonemap() +static void register_node_type_cmp_tonemap() { namespace file_ns = blender::nodes::node_composite_tonemap_cc; @@ -506,3 +506,4 @@ void register_node_type_cmp_tonemap() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_tonemap) diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc index 46254d49078..7f8da913301 100644 --- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc +++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc @@ -352,7 +352,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_trackpos_cc -void register_node_type_cmp_trackpos() +static void register_node_type_cmp_trackpos() { namespace file_ns = blender::nodes::node_composite_trackpos_cc; @@ -373,3 +373,4 @@ void register_node_type_cmp_trackpos() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_trackpos) diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.cc b/source/blender/nodes/composite/nodes/node_composite_transform.cc index f3c2849cf2c..47e4db3ae09 100644 --- a/source/blender/nodes/composite/nodes/node_composite_transform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_transform.cc @@ -101,7 +101,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_transform_cc -void register_node_type_cmp_transform() +static void register_node_type_cmp_transform() { namespace file_ns = blender::nodes::node_composite_transform_cc; @@ -118,3 +118,4 @@ void register_node_type_cmp_transform() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_transform) diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.cc b/source/blender/nodes/composite/nodes/node_composite_translate.cc index 826798f3f44..81e2babc764 100644 --- a/source/blender/nodes/composite/nodes/node_composite_translate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_translate.cc @@ -124,7 +124,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_translate_cc -void register_node_type_cmp_translate() +static void register_node_type_cmp_translate() { namespace file_ns = blender::nodes::node_composite_translate_cc; @@ -144,3 +144,4 @@ void register_node_type_cmp_translate() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_translate) 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 a898d482d1f..3c0e8559fed 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 @@ -130,7 +130,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_color_ramp_cc -void register_node_type_cmp_valtorgb() +static void register_node_type_cmp_valtorgb() { namespace file_ns = blender::nodes::node_composite_color_ramp_cc; @@ -151,6 +151,7 @@ void register_node_type_cmp_valtorgb() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_valtorgb) /* **************** RGBTOBW ******************** */ @@ -196,7 +197,7 @@ static void node_build_multi_function(blender::nodes::NodeMultiFunctionBuilder & } // namespace blender::nodes::node_composite_rgb_to_bw_cc -void register_node_type_cmp_rgbtobw() +static void register_node_type_cmp_rgbtobw() { namespace file_ns = blender::nodes::node_composite_rgb_to_bw_cc; @@ -215,3 +216,4 @@ void register_node_type_cmp_rgbtobw() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_rgbtobw) diff --git a/source/blender/nodes/composite/nodes/node_composite_value.cc b/source/blender/nodes/composite/nodes/node_composite_value.cc index c081642fb1e..8fdd4fb61bf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_value.cc @@ -44,7 +44,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_value_cc -void register_node_type_cmp_value() +static void register_node_type_cmp_value() { namespace file_ns = blender::nodes::node_composite_value_cc; @@ -62,3 +62,4 @@ void register_node_type_cmp_value() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_value) 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 20010b5a2e2..4b51cb87e6e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc @@ -689,7 +689,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_vec_blur_cc -void register_node_type_cmp_vecblur() +static void register_node_type_cmp_vecblur() { namespace file_ns = blender::nodes::node_composite_vec_blur_cc; @@ -708,3 +708,4 @@ void register_node_type_cmp_vecblur() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_vecblur) diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index 0bbdb152f68..b0b1290ead8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -176,7 +176,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_viewer_cc -void register_node_type_cmp_viewer() +static void register_node_type_cmp_viewer() { namespace file_ns = blender::nodes::node_composite_viewer_cc; @@ -198,3 +198,4 @@ void register_node_type_cmp_viewer() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_viewer) diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc index 86124ad5def..81e6b58ed93 100644 --- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc +++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc @@ -430,7 +430,7 @@ static NodeOperation *get_compositor_operation(Context &context, DNode node) } // namespace blender::nodes::node_composite_zcombine_cc -void register_node_type_cmp_zcombine() +static void register_node_type_cmp_zcombine() { namespace file_ns = blender::nodes::node_composite_zcombine_cc; @@ -446,3 +446,4 @@ void register_node_type_cmp_zcombine() blender::bke::node_register_type(ntype); } +NOD_REGISTER_NODE(register_node_type_cmp_zcombine) diff --git a/source/blender/nodes/intern/node_register.cc b/source/blender/nodes/intern/node_register.cc index be96b87d1e6..f8efbba2f34 100644 --- a/source/blender/nodes/intern/node_register.cc +++ b/source/blender/nodes/intern/node_register.cc @@ -2,6 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "NOD_composite.hh" #include "NOD_geometry.hh" #include "NOD_register.hh" #include "NOD_socket.hh" @@ -141,13 +142,14 @@ void register_nodes() register_standard_node_socket_types(); register_node_tree_type_geo(); + register_node_tree_type_cmp(); register_node_type_frame(); register_node_type_reroute(); register_node_type_group_input(); register_node_type_group_output(); - register_composite_nodes(); + register_compositor_nodes(); register_shader_nodes(); register_texture_nodes(); register_geometry_nodes();