Commit: 4ec5a8cbc23311776ad3f5745c52331b4937ddb0 Author: Hans Goudey Date: Sat Nov 5 16:10:27 2022 +0100 Branches: master https://developer.blender.org/rB4ec5a8cbc23311776ad3f5745c52331b4937ddb0
Cleanup: Remove unnecessary node type registraction functions These functions provided little benefit compared to simply setting the function pointers directly. =================================================================== M source/blender/blenkernel/BKE_node.h M source/blender/blenkernel/intern/node.cc M source/blender/nodes/composite/nodes/node_composite_alpha_over.cc M source/blender/nodes/composite/nodes/node_composite_antialiasing.cc M source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc M source/blender/nodes/composite/nodes/node_composite_blur.cc M source/blender/nodes/composite/nodes/node_composite_bokehblur.cc M source/blender/nodes/composite/nodes/node_composite_bokehimage.cc M source/blender/nodes/composite/nodes/node_composite_boxmask.cc M source/blender/nodes/composite/nodes/node_composite_brightness.cc M source/blender/nodes/composite/nodes/node_composite_channel_matte.cc M source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc M source/blender/nodes/composite/nodes/node_composite_color_matte.cc M source/blender/nodes/composite/nodes/node_composite_color_spill.cc M source/blender/nodes/composite/nodes/node_composite_colorbalance.cc M source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc M source/blender/nodes/composite/nodes/node_composite_common.cc M source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc M source/blender/nodes/composite/nodes/node_composite_crop.cc M source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc M source/blender/nodes/composite/nodes/node_composite_curves.cc M source/blender/nodes/composite/nodes/node_composite_defocus.cc M source/blender/nodes/composite/nodes/node_composite_denoise.cc M source/blender/nodes/composite/nodes/node_composite_despeckle.cc M source/blender/nodes/composite/nodes/node_composite_diff_matte.cc M source/blender/nodes/composite/nodes/node_composite_dilate.cc M source/blender/nodes/composite/nodes/node_composite_directionalblur.cc M source/blender/nodes/composite/nodes/node_composite_distance_matte.cc M source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc M source/blender/nodes/composite/nodes/node_composite_glare.cc M source/blender/nodes/composite/nodes/node_composite_huecorrect.cc M source/blender/nodes/composite/nodes/node_composite_image.cc M source/blender/nodes/composite/nodes/node_composite_invert.cc M source/blender/nodes/composite/nodes/node_composite_keying.cc M source/blender/nodes/composite/nodes/node_composite_lensdist.cc M source/blender/nodes/composite/nodes/node_composite_levels.cc M source/blender/nodes/composite/nodes/node_composite_luma_matte.cc M source/blender/nodes/composite/nodes/node_composite_map_value.cc M source/blender/nodes/composite/nodes/node_composite_mask.cc M source/blender/nodes/composite/nodes/node_composite_math.cc M source/blender/nodes/composite/nodes/node_composite_output_file.cc M source/blender/nodes/composite/nodes/node_composite_rotate.cc M source/blender/nodes/composite/nodes/node_composite_scale.cc M source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc M source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc M source/blender/nodes/composite/nodes/node_composite_setalpha.cc M source/blender/nodes/composite/nodes/node_composite_split_viewer.cc M source/blender/nodes/composite/nodes/node_composite_sunbeams.cc M source/blender/nodes/composite/nodes/node_composite_switchview.cc M source/blender/nodes/composite/nodes/node_composite_tonemap.cc M source/blender/nodes/composite/nodes/node_composite_translate.cc M source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc M source/blender/nodes/composite/nodes/node_composite_vec_blur.cc M source/blender/nodes/composite/nodes/node_composite_viewer.cc M source/blender/nodes/function/nodes/node_fn_boolean_math.cc M source/blender/nodes/function/nodes/node_fn_combine_color.cc M source/blender/nodes/function/nodes/node_fn_compare.cc M source/blender/nodes/function/nodes/node_fn_input_bool.cc M source/blender/nodes/function/nodes/node_fn_input_color.cc M source/blender/nodes/function/nodes/node_fn_input_int.cc M source/blender/nodes/function/nodes/node_fn_input_string.cc M source/blender/nodes/function/nodes/node_fn_input_vector.cc M source/blender/nodes/function/nodes/node_fn_random_value.cc M source/blender/nodes/function/nodes/node_fn_rotate_euler.cc M source/blender/nodes/function/nodes/node_fn_separate_color.cc M source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc M source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc M source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc M source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc M source/blender/nodes/geometry/nodes/node_geo_boolean.cc M source/blender/nodes/geometry/nodes/node_geo_collection_info.cc M source/blender/nodes/geometry/nodes/node_geo_common.cc M source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc M source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc M source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc M source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc M source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc M source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc M source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc M source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc M source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc M source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc M source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc M source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc M source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc M source/blender/nodes/geometry/nodes/node_geo_image_texture.cc M source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc M source/blender/nodes/geometry/nodes/node_geo_object_info.cc M source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc M source/blender/nodes/geometry/nodes/node_geo_proximity.cc M source/blender/nodes/geometry/nodes/node_geo_raycast.cc M source/blender/nodes/geometry/nodes/node_geo_sample_index.cc M source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc M source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc M source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc M source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc M source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc M source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc M source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc M source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc M source/blender/nodes/geometry/nodes/node_geo_switch.cc M source/blender/nodes/geometry/nodes/node_geo_triangulate.cc M source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc M source/blender/nodes/geometry/nodes/node_geo_viewer.cc M source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc M source/blender/nodes/intern/node_common.cc M source/blender/nodes/shader/nodes/node_shader_add_shader.cc M source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc M source/blender/nodes/shader/nodes/node_shader_attribute.cc M source/blender/nodes/shader/nodes/node_shader_background.cc M source/blender/nodes/shader/nodes/node_shader_bevel.cc M source/blender/nodes/shader/nodes/node_shader_blackbody.cc M source/blender/nodes/shader/nodes/node_shader_brightness.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc M source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc M source/blender/nodes/shader/nodes/node_shader_bump.cc M source/blender/nodes/shader/nodes/node_shader_camera.cc M source/blender/nodes/shader/nodes/node_shader_clamp.cc M source/blender/nodes/shader/nodes/node_shader_color_ramp.cc M source/blender/nodes/shader/nodes/node_shader_common.cc M source/blender/nodes/shader/nodes/node_shader_curves.cc M source/blender/nodes/shader/nodes/node_shader_displacement.cc M source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc M source/blender/nodes/shader/nodes/node_shader_emission.cc M source/blender/nodes/shader/nodes/node_shader_fresnel.cc M source/blender/nodes/shader/nodes/node_shader_gamma.cc M source/blender/nodes/shader/nodes/node_shader_geometry.cc M source/blender/nodes/shader/nodes/node_shader_hair_info.cc M source/blender/nodes/shader/nodes/node_shader_holdout.cc M source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc M source/blender/nodes/shader/nodes/node_shader_ies_light.cc M source/blender/nodes/shader/nodes/node_shader_invert.cc M source/blender/nodes/shader/nodes/node_shader_layer_weight.cc M source/blender/nodes/shader/nodes/node_shader_light_falloff.cc M source/blender/nodes/shader/nodes/node_shader_light_path.cc M source/blender/nodes/shader/nodes/node_shader_map_range.cc M source/blender/nodes/shader/nodes/node_shader_mapping.cc M source/blender/nodes/shader/nodes/node_shader_math.cc M source/blender/nodes/shader/nodes/node_shader_mix.cc M source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc M source/blender/nodes/shader/nodes/node_shader_mix_shader.cc M source/blender/nodes/shader/nodes/node_shader_normal.cc M source/blender/nodes/shader/nodes/node_shader_normal_map.cc M source/blender/nodes/shader/nodes/node_shader_object_info.cc M source/blender/nodes/shader/nodes/node_shader_output_aov.cc M source/blender/nodes/shader/nodes/node_shader_output_light.cc M source/blender/nodes/shader/nodes/node_shader_output_material.cc M source/blender/nodes/shader/nodes/node_shader_output_world.cc M source/blender/nodes/shader/nodes/node_shader_particle_info.cc M source/blender/nodes/shader/nodes/node_shader_point_info.cc M source/blender/nodes/shader/nodes/node_shader_rgb.cc M source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc M source/blender/nodes/shader/nodes/node_shader_script.cc M source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc M source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc M source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc M source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc M source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc M source/blender/nodes/shader/nodes/node_shader_squeeze.cc M source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc M source/blender/nodes/shader/nodes/node_shader_tangent.cc M source/blender/nodes/shader/nodes/node_shader_tex_brick.cc M source/blender/nodes/shader/nodes/node_shader_tex_checker.cc M source/blender/nodes/shader/nodes/node_shader_tex_coord.cc M source/blender/nodes/shader/nodes/node_shader_tex_environment.cc M source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc M source/blender/nodes/shader/nodes/node_shader_tex_image.cc M source/blender/nodes/shader/nodes/node_shader_tex_magic.cc M source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc M source/blender/nodes/shader/nodes/node_shader_tex_noise.cc M source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc M source/blender/nodes/shader/nodes/node_shader_tex_sky.cc M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc M source/blender/nodes/shader/nodes/node_shader_tex_wave.cc M source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc M source/blender/nodes/shader/nodes/node_shader_uvmap.cc M source/blender/nodes/shader/nodes/node_shader_value.cc M source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc M source/blender/nodes/shader/nodes/node_shader_vector_math.cc M source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc M source/blender/nodes/shader/nodes/node_shader_vector_transform.cc M source/blender/nodes/shader/nodes/node_shader_vertex_color.cc M source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc M source/blender/nodes/shader/nodes/node_shader_volume_info.cc M source/blender/nodes/shader/nodes/node_shader_volume_principled.cc M source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc M source/blender/nodes/shader/nodes/node_shader_wavelength.cc M source/blender/nodes/shader/nodes/node_shader_wireframe.cc M source/blender/nodes/texture/nodes/node_texture_at.c M source/blender/nodes/texture/nodes/node_texture_bricks.c M source/blender/nodes/texture/nodes/node_texture_checker.c M source/blender/nodes/texture/nodes/node_texture_combine_color.c M source/blender/nodes/texture/nodes/node_texture_common.c M source/blender/nodes/texture/nodes/node_texture_compose.c M source/blender/nodes/texture/nodes/node_texture_coord.c M source/blender/nodes/texture/nodes/node_texture_curves.c M source/blender/nodes/texture/nodes/node_texture_decompose.c M source/blender/nodes/texture/nodes/node_texture_distance.c M source/blender/nodes/texture/nodes/node_texture_hueSatVal.c M source/blender/nodes/texture/nodes/node_texture_image.c M source/blender/nodes/texture/nodes/node_texture_invert.c M source/blender/nodes/texture/nodes/node_texture_math.c M source/blender/nodes/texture/nodes/node_texture_mixRgb.c M source/blender/nodes/texture/nodes/node_texture_output.c M source/blender/nodes/texture/nodes/node_texture_proc.c M source/blender/nodes/texture/nodes/node_texture_rotate.c M source/blender/nodes/texture/nodes/node_texture_scale.c M source/blender/nodes/texture/nodes/node_texture_separate_color.c M source/blender/nodes/texture/nodes/node_texture_texture.c M source/blender/nodes/texture/nodes/node_texture_translate.c M source/blender/nodes/texture/nodes/node_texture_valToNor.c M source/blender/nodes/texture/nodes/node_texture_valToRgb.c M source/blender/nodes/texture/nodes/node_texture_viewer.c =================================================================== diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 6eb9650348a..ef46f4db998 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -988,8 +988,6 @@ void node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTemplate *outputs); void node_type_size(struct bNodeType *ntype, int width, int minwidth, int maxwidth); void node_type_size_preset(struct bNodeType *ntype, eNodeSizePreset size); -void node_type_init(struct bNodeType *ntype, - void (*initfunc)(struct bNodeTree *ntree, struct bNode *node)); /** * \warning Nodes defining a storage type _must_ allocate this for new nodes. * Otherwise nodes will reload as undefined (T46619). @@ -1000,17 +998,6 @@ void node_type_storage(struct bNodeType *ntype, void (*copyfunc)(struct bNodeTree *dest_ntree, struct bNode *dest_node, const struct bNode *src_node)); -void node_type_update(struct bNodeType *ntype, - void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node)); -void node_type_group_update(struct bNodeType *ntype, - void (*group_update_func)(struct bNodeTree *ntree, - struct bNode *node)); - -void node_type_exec(struct bNodeType *ntype, - NodeInitExecFunction init_exec_fn, - NodeFreeExecFunction free_exec_fn, - NodeExecFunction exec_fn); -void node_type_gpu(struct bNodeType *ntype, NodeGPUExecFunction gpu_fn); /** \} */ diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index ad9d4e4fcca..aa6ca37f48c 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -4346,12 +4346,6 @@ void node_type_socket_templates(struct bNodeType *ntype, } } -void node_type_init(struct bNodeType *ntype, - void (*initfunc)(struct bNodeTree *ntree, struct bNode *node)) -{ - ntype->initfunc = initfunc; -} - void node_type_size(struct bNodeType *ntype, int width, int minwidth, int maxwidth) { ntype->width = width; @@ -4399,33 +4393,6 @@ void node_type_storage(bNodeType *ntype, ntype->freefunc = freefunc; } -void node_type_update(struct bNodeType *ntype, - void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node)) -{ - ntype->updatefunc = updatefunc; -} - -void node_type_group_update(struct bNodeType *ntype, - void (*group_update_func)(struct bNodeTree *ntree, struct bNode *node)) -{ - ntype->group_update_func = group_update_func; -} - -void node_type_exec(struct bNodeType *ntype, - NodeInitExecFunction init_exec_fn, - NodeFreeExecFunction free_exec_fn, - NodeExecFunction exec_fn) -{ - ntype->init_exec_fn = init_exec_fn; - ntype->free_exec_fn = free_exec_fn; - ntype->exec_fn = exec_fn; -} - -void node_type_gpu(struct bNodeType *ntype, NodeGPUExecFunction gpu_fn) -{ - ntype->gpu_fn = gpu_fn; -} - /* callbacks for undefined types */ static bool node_undefined_poll(bNodeType * /*ntype*/, 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 e2f4e80270e..dffdc4a9408 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc @@ -108,7 +108,7 @@ void register_node_type_cmp_alphaover() cmp_node_type_base(&ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR); ntype.declare = file_ns::cmp_node_alphaover_declare; ntype.draw_buttons = file_ns::node_composit_buts_alphaover; - node_type_init(&ntype, file_ns::node_alphaover_init); + ntype.initfunc = file_ns::node_alphaover_init; node_type_storage( &ntype, "NodeTwoFloats", node_free_standard_storage, node_copy_standard_storage); ntype.get_compositor_shader_node = file_ns::get_compositor_shader_node; diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc index 25fefd33199..8c77df08211 100644 --- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc +++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc @@ -74,7 +74,7 @@ void register_node_type_cmp_antialiasing() ntype.draw_buttons = file_ns::node_composit_buts_antialiasing; ntype.flag |= NODE_PREVIEW; node_type_size(&ntype, 170, 140, 200); - node_type_init(&ntype, file_ns::node_composit_init_antialiasing); + ntype.initfunc = file_ns::node_composit_init_antialiasing; node_type_storage( &ntype, "NodeAntiAliasingData", node_free_standard_storage, node_copy_standard_storage); ntype.get_compositor_operation = file_ns::get_compositor_operation; diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index af7581d845f..65990677ae3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -119,7 +119,7 @@ void register_node_type_cmp_bilateralblur() cmp_node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER); ntype.declare = file_ns::cmp_node_bilateralblur_declare; ntype.draw_buttons = file_ns::node_composit_buts_bilateralblur; - node_type_init(&ntype, file_ns::node_composit_init_bilateralblur); + ntype.initfunc = file_ns::node_composit_init_bilateralblur; node_type_storage( &ntype, "NodeBilateralBlurData", node_free_standard_storage, node_copy_standard_storage); ntype.get_compositor_operation = file_ns::get_compositor_operation; diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 63f3829ee0b..6eacc685c7e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -324,7 +324,7 @@ void register_node_type_cmp_blur() ntype.declare = file_ns::cmp_node_blur_declare; ntype.draw_buttons = file_ns::node_composit_buts_blur; ntype.flag |= NODE_PREVIEW; - node_type_init(&ntype, file_ns::node_composit_init_blur); + ntype.initfunc = file_ns::node_composit_init_blur; node_type_storage( &ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage); ntype.get_compositor_operation = file_ns::get_compositor_operation; diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index a581d87a463..f09bf1f5afd 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -215,7 +215,7 @@ void register_node_type_cmp_bokehblur() cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER); ntype.declare = file_ns::cmp_node_bokehblur_declare; ntype.draw_buttons = file_ns::node_composit_buts_bokehblur; - node_type_init(&ntype, file_ns::node_composit_init_bokehblur); + ntype.initfunc = file_ns::node_composit_init_bokehblur; ntype.get_compositor_operation = file_ns::get_compositor_operation; nodeRegisterType(&ntype); diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index eb35b933d1b..8b817d3a677 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -122,7 +122,7 @@ void register_node_type_cmp_bokehimage() ntype.declare = file_ns::cmp_node_bokehimage_declare; ntype.draw_buttons = file_ns::node_composit_buts_bokehimage; ntype.flag |= NODE_PREVIEW; - node_type_init(&ntype, file_ns::node_composit_init_bokehimage); + ntype.initfunc = file_ns::node_composit_init_bokehimage; node_type_storage( &ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage); ntype.get_compositor_operation = file_ns::get_compositor_operation; diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc index 668dc9d92de..17b5d64de91 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc @@ -157,7 +157,7 @@ void register_node_type_cmp_boxmask() cmp_node_type_base(&ntype, CMP_NODE_MASK_BOX, "Box Mask", NODE_CLASS_MATTE); ntype.declare = file_ns::cmp_node_boxmask_declare; ntype.draw_buttons = file_ns::node_composit_buts_boxmask; - node_type_init(&ntype, file_ns::node_composit_init_boxmask); + ntype.initfunc = file_ns::node_composit_init_boxmask; node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage); ntype.get_compositor_operation = file_ns::get_compositor_operation; diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index 6b9fef75524..08794914e91 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -81,7 +81,7 @@ void register_node_type_cmp_brightcontrast() cmp_node_type_base(&ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR); ntype.declare = file_ns::cmp_node_brightcontrast_declare; ntype.draw_buttons = file_ns::node_composit_buts_brightcontrast; - node_type_init(&ntype, file_ns::node_composit_init_brightcontrast); + ntype.initfunc = file_ns::node_composit_init_brightcontrast; ntype.get_compositor_shader_node = file_ns::get_compositor_shader_node; nodeRegisterType(&ntype); diff --git a/source/blen @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs