diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index f680c0dc8c4..afe9cebc450 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -4879,9 +4879,9 @@ static const EnumPropertyItem node_scatter_phase_items[] = { /* -- Common nodes ---------------------------------------------------------- */ -static void def_group_input(StructRNA * /*srna*/) {} +static void def_group_input(BlenderRNA * /*brna*/, StructRNA * /*srna*/) {} -static void def_group_output(StructRNA *srna) +static void def_group_output(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -4893,7 +4893,7 @@ static void def_group_output(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_group(StructRNA *srna) +static void def_group(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -4923,10 +4923,10 @@ static void def_custom_group(BlenderRNA *brna, RNA_def_struct_register_funcs(srna, reg_func, "rna_Node_unregister", nullptr); - def_group(srna); + def_group(brna, srna); } -static void def_frame(StructRNA *srna) +static void def_frame(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -4953,7 +4953,7 @@ static void def_frame(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, "rna_FrameNode_label_size_update"); } -static void def_clamp(StructRNA *srna) +static void def_clamp(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -4964,7 +4964,7 @@ static void def_clamp(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_map_range(StructRNA *srna) +static void def_map_range(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem rna_enum_data_type_items[] = { {CD_PROP_FLOAT, "FLOAT", 0, "Float", "Floating-point value"}, @@ -4994,7 +4994,7 @@ static void def_map_range(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_math(StructRNA *srna) +static void def_math(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5012,7 +5012,7 @@ static void def_math(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_mix(StructRNA *srna) +static void def_sh_mix(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem rna_enum_mix_mode_items[] = { {NODE_MIX_MODE_UNIFORM, "UNIFORM", 0, "Uniform", "Use a single factor for all components"}, @@ -5054,7 +5054,7 @@ static void def_sh_mix(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_float_to_int(StructRNA *srna) +static void def_float_to_int(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5067,7 +5067,7 @@ static void def_float_to_int(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_vector_math(StructRNA *srna) +static void def_vector_math(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5080,7 +5080,7 @@ static void def_vector_math(StructRNA *srna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); } -static void def_rgb_curve(StructRNA *srna) +static void def_rgb_curve(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5091,7 +5091,7 @@ static void def_rgb_curve(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_vector_curve(StructRNA *srna) +static void def_vector_curve(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5102,7 +5102,7 @@ static void def_vector_curve(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_float_curve(StructRNA *srna) +static void def_float_curve(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5113,7 +5113,7 @@ static void def_float_curve(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_time(StructRNA *srna) +static void def_time(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5134,7 +5134,7 @@ static void def_time(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_colorramp(StructRNA *srna) +static void def_colorramp(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5145,7 +5145,7 @@ static void def_colorramp(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_mix_rgb(StructRNA *srna) +static void def_mix_rgb(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5166,7 +5166,7 @@ static void def_mix_rgb(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_texture(StructRNA *srna) +static void def_texture(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5185,7 +5185,7 @@ static void def_texture(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_fn_input_color(StructRNA *srna) +static void def_fn_input_color(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5198,7 +5198,7 @@ static void def_fn_input_color(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_fn_input_bool(StructRNA *srna) +static void def_fn_input_bool(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5210,7 +5210,7 @@ static void def_fn_input_bool(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_fn_input_int(StructRNA *srna) +static void def_fn_input_int(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5223,7 +5223,7 @@ static void def_fn_input_int(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_fn_input_rotation(StructRNA *srna) +static void def_fn_input_rotation(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5235,7 +5235,7 @@ static void def_fn_input_rotation(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_fn_input_vector(StructRNA *srna) +static void def_fn_input_vector(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5248,7 +5248,7 @@ static void def_fn_input_vector(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_fn_input_string(StructRNA *srna) +static void def_fn_input_string(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5261,7 +5261,7 @@ static void def_fn_input_string(StructRNA *srna) /* -- Shader Nodes ---------------------------------------------------------- */ -static void def_sh_output(StructRNA *srna) +static void def_sh_output(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5280,13 +5280,13 @@ static void def_sh_output(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_output_linestyle(StructRNA *srna) +static void def_sh_output_linestyle(BlenderRNA *brna, StructRNA *srna) { - def_sh_output(srna); - def_mix_rgb(srna); + def_sh_output(brna, srna); + def_mix_rgb(brna, srna); } -static void def_sh_mapping(StructRNA *srna) +static void def_sh_mapping(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5297,7 +5297,7 @@ static void def_sh_mapping(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_sh_vector_rotate(StructRNA *srna) +static void def_sh_vector_rotate(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5313,7 +5313,7 @@ static void def_sh_vector_rotate(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_attribute(StructRNA *srna) +static void def_sh_attribute(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem prop_attribute_type[] = { {SHD_ATTRIBUTE_GEOMETRY, @@ -5358,7 +5358,7 @@ static void def_sh_attribute(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_tex(StructRNA *srna) +static void def_sh_tex(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5373,7 +5373,7 @@ static void def_sh_tex(StructRNA *srna) RNA_def_property_ui_text(prop, "Color Mapping", "Color mapping settings"); } -static void def_sh_tex_sky(StructRNA *srna) +static void def_sh_tex_sky(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_sky_type[] = { {SHD_SKY_PREETHAM, "PREETHAM", 0, "Preetham", "Preetham 1999"}, @@ -5386,7 +5386,7 @@ static void def_sh_tex_sky(StructRNA *srna) PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexSky", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "sky_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "sky_model"); @@ -5490,7 +5490,7 @@ static const EnumPropertyItem sh_tex_prop_interpolation_items[] = { {0, nullptr, 0, nullptr, nullptr}, }; -static void def_sh_tex_environment(StructRNA *srna) +static void def_sh_tex_environment(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_projection_items[] = { {SHD_PROJ_EQUIRECTANGULAR, @@ -5517,7 +5517,7 @@ static void def_sh_tex_environment(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_tex_image_update"); RNA_def_struct_sdna_from(srna, "NodeTexEnvironment", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "projection", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_projection_items); @@ -5539,7 +5539,7 @@ static void def_sh_tex_environment(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_gabor(StructRNA *srna) +static void def_sh_tex_gabor(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_gabor_types[] = { {SHD_GABOR_TYPE_2D, @@ -5552,7 +5552,7 @@ static void def_sh_tex_gabor(StructRNA *srna) }; RNA_def_struct_sdna_from(srna, "NodeTexGabor", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); PropertyRNA *prop; prop = RNA_def_property(srna, "gabor_type", PROP_ENUM, PROP_NONE); @@ -5562,7 +5562,7 @@ static void def_sh_tex_gabor(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_ShaderNode_socket_update"); } -static void def_sh_tex_image(StructRNA *srna) +static void def_sh_tex_image(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_projection_items[] = { {SHD_PROJ_FLAT, @@ -5600,7 +5600,7 @@ static void def_sh_tex_image(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_tex_image_update"); RNA_def_struct_sdna_from(srna, "NodeTexImage", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "projection", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_projection_items); @@ -5636,7 +5636,7 @@ static void def_sh_tex_image(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_tex_combsep_color(StructRNA *srna) +static void def_tex_combsep_color(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5647,7 +5647,7 @@ static void def_tex_combsep_color(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_geo_image_texture(StructRNA *srna) +static void def_geo_image_texture(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem fn_tex_prop_interpolation_items[] = { {SHD_INTERP_LINEAR, "Linear", 0, "Linear", "Linear interpolation"}, @@ -5673,7 +5673,7 @@ static void def_geo_image_texture(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void rna_def_geo_gizmo_transform(StructRNA *srna) +static void rna_def_geo_gizmo_transform(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -5725,7 +5725,7 @@ static void rna_def_geo_gizmo_transform(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_gradient(StructRNA *srna) +static void def_sh_tex_gradient(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_gradient_type[] = { {SHD_BLEND_LINEAR, "LINEAR", 0, "Linear", "Create a linear progression"}, @@ -5749,7 +5749,7 @@ static void def_sh_tex_gradient(StructRNA *srna) PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexGradient", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "gradient_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_gradient_type); @@ -5757,7 +5757,7 @@ static void def_sh_tex_gradient(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_noise(StructRNA *srna) +static void def_sh_tex_noise(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_noise_type[] = { {SHD_NOISE_MULTIFRACTAL, @@ -5788,7 +5788,7 @@ static void def_sh_tex_noise(StructRNA *srna) PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexNoise", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "noise_dimensions", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "dimensions"); @@ -5809,18 +5809,18 @@ static void def_sh_tex_noise(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_tex_checker(StructRNA *srna) +static void def_sh_tex_checker(BlenderRNA *brna, StructRNA *srna) { RNA_def_struct_sdna_from(srna, "NodeTexChecker", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); } -static void def_sh_tex_brick(StructRNA *srna) +static void def_sh_tex_brick(BlenderRNA *brna, StructRNA *srna) { PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexBrick", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "offset_frequency", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, nullptr, "offset_freq"); @@ -5859,12 +5859,12 @@ static void def_sh_tex_brick(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_magic(StructRNA *srna) +static void def_sh_tex_magic(BlenderRNA *brna, StructRNA *srna) { PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexMagic", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "turbulence_depth", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, nullptr, "depth"); @@ -5873,7 +5873,7 @@ static void def_sh_tex_magic(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_voronoi(StructRNA *srna) +static void def_sh_tex_voronoi(BlenderRNA *brna, StructRNA *srna) { static EnumPropertyItem prop_distance_items[] = { {SHD_VORONOI_EUCLIDEAN, "EUCLIDEAN", 0, "Euclidean", "Euclidean distance"}, @@ -5913,7 +5913,7 @@ static void def_sh_tex_voronoi(StructRNA *srna) PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexVoronoi", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "voronoi_dimensions", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "dimensions"); @@ -5942,7 +5942,7 @@ static void def_sh_tex_voronoi(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_tex_wave(StructRNA *srna) +static void def_sh_tex_wave(BlenderRNA *brna, StructRNA *srna) { static const EnumPropertyItem prop_wave_type_items[] = { {SHD_WAVE_BANDS, "BANDS", 0, "Bands", "Use standard wave texture in bands"}, @@ -5980,7 +5980,7 @@ static void def_sh_tex_wave(StructRNA *srna) PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeTexWave", "storage"); - def_sh_tex(srna); + def_sh_tex(brna, srna); prop = RNA_def_property(srna, "wave_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "wave_type"); @@ -6007,7 +6007,7 @@ static void def_sh_tex_wave(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_white_noise(StructRNA *srna) +static void def_sh_tex_white_noise(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6019,7 +6019,7 @@ static void def_sh_tex_white_noise(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_sh_tex_coord(StructRNA *srna) +static void def_sh_tex_coord(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6039,7 +6039,7 @@ static void def_sh_tex_coord(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_vect_transform(StructRNA *srna) +static void def_sh_vect_transform(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem prop_vect_type_items[] = { {SHD_VECT_TRANSFORM_TYPE_POINT, "POINT", 0, "Point", "Transform a point"}, @@ -6080,7 +6080,7 @@ static void def_sh_vect_transform(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_tex_wireframe(StructRNA *srna) +static void def_sh_tex_wireframe(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6091,7 +6091,7 @@ static void def_sh_tex_wireframe(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_tex_pointdensity(StructRNA *srna) +static void def_sh_tex_pointdensity(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6251,7 +6251,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) RNA_def_function_output(func, parm); } -static void def_metallic(StructRNA *srna) +static void def_metallic(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6268,7 +6268,7 @@ static void def_metallic(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_glossy(StructRNA *srna) +static void def_glossy(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6279,7 +6279,7 @@ static void def_glossy(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_glass(StructRNA *srna) +static void def_glass(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6290,7 +6290,7 @@ static void def_glass(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sheen(StructRNA *srna) +static void def_sheen(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6301,7 +6301,7 @@ static void def_sheen(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_principled(StructRNA *srna) +static void def_principled(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6319,7 +6319,7 @@ static void def_principled(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_refraction(StructRNA *srna) +static void def_refraction(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6330,7 +6330,7 @@ static void def_refraction(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_scatter(StructRNA *srna) +static void def_scatter(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6341,7 +6341,7 @@ static void def_scatter(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_toon(StructRNA *srna) +static void def_toon(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6352,7 +6352,7 @@ static void def_toon(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_bump(StructRNA *srna) +static void def_sh_bump(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6363,7 +6363,7 @@ static void def_sh_bump(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_hair(StructRNA *srna) +static void def_hair(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6375,7 +6375,7 @@ static void def_hair(StructRNA *srna) } /* RNA initialization for the custom properties. */ -static void def_hair_principled(StructRNA *srna) +static void def_hair_principled(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6399,7 +6399,7 @@ static void def_hair_principled(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_sh_uvmap(StructRNA *srna) +static void def_sh_uvmap(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6418,7 +6418,7 @@ static void def_sh_uvmap(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_vertex_color(StructRNA *srna) +static void def_sh_vertex_color(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6431,7 +6431,7 @@ static void def_sh_vertex_color(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_uvalongstroke(StructRNA *srna) +static void def_sh_uvalongstroke(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6442,7 +6442,7 @@ static void def_sh_uvalongstroke(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_normal_map(StructRNA *srna) +static void def_sh_normal_map(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem prop_space_items[] = { {SHD_SPACE_TANGENT, "TANGENT", 0, "Tangent Space", "Tangent space normal mapping"}, @@ -6477,7 +6477,7 @@ static void def_sh_normal_map(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_displacement(StructRNA *srna) +static void def_sh_displacement(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem prop_space_items[] = { {SHD_SPACE_OBJECT, @@ -6504,7 +6504,7 @@ static void def_sh_displacement(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_vector_displacement(StructRNA *srna) +static void def_sh_vector_displacement(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem prop_space_items[] = { {SHD_SPACE_TANGENT, @@ -6528,7 +6528,7 @@ static void def_sh_vector_displacement(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_tangent(StructRNA *srna) +static void def_sh_tangent(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem prop_direction_type_items[] = { {SHD_TANGENT_RADIAL, "RADIAL", 0, "Radial", "Radial tangent around the X, Y or Z axis"}, @@ -6564,7 +6564,7 @@ static void def_sh_tangent(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_bevel(StructRNA *srna) +static void def_sh_bevel(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6576,7 +6576,7 @@ static void def_sh_bevel(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Node_update"); } -static void def_sh_ambient_occlusion(StructRNA *srna) +static void def_sh_ambient_occlusion(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6598,7 +6598,7 @@ static void def_sh_ambient_occlusion(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_sh_subsurface(StructRNA *srna) +static void def_sh_subsurface(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6609,7 +6609,7 @@ static void def_sh_subsurface(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); } -static void def_sh_tex_ies(StructRNA *srna) +static void def_sh_tex_ies(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6637,7 +6637,7 @@ static void def_sh_tex_ies(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_output_aov(StructRNA *srna) +static void def_sh_output_aov(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6651,7 +6651,7 @@ static void def_sh_output_aov(StructRNA *srna) RNA_def_struct_sdna_from(srna, "bNode", nullptr); } -static void def_sh_combsep_color(StructRNA *srna) +static void def_sh_combsep_color(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem type_items[] = { {NODE_COMBSEP_COLOR_RGB, "RGB", ICON_NONE, "RGB", "Use RGB color processing"}, @@ -6670,7 +6670,7 @@ static void def_sh_combsep_color(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_sh_script(StructRNA *srna) +static void def_sh_script(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6749,7 +6749,7 @@ static void def_sh_script(StructRNA *srna) /* -- Compositor Nodes ------------------------------------------------------ */ -static void def_cmp_alpha_over(StructRNA *srna) +static void def_cmp_alpha_over(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6768,7 +6768,7 @@ static void def_cmp_alpha_over(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_blur(StructRNA *srna) +static void def_cmp_blur(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6866,7 +6866,7 @@ static void def_cmp_blur(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_filter(StructRNA *srna) +static void def_cmp_filter(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6877,7 +6877,7 @@ static void def_cmp_filter(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_map_value(StructRNA *srna) +static void def_cmp_map_value(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6922,7 +6922,7 @@ static void def_cmp_map_value(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_map_range(StructRNA *srna) +static void def_cmp_map_range(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6932,7 +6932,7 @@ static void def_cmp_map_range(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_vector_blur(StructRNA *srna) +static void def_cmp_vector_blur(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -6976,7 +6976,7 @@ static void def_cmp_vector_blur(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_set_alpha(StructRNA *srna) +static void def_cmp_set_alpha(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7002,7 +7002,7 @@ static void def_cmp_set_alpha(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_levels(StructRNA *srna) +static void def_cmp_levels(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7022,7 +7022,7 @@ static void def_cmp_levels(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_node_image_user(StructRNA *srna) +static void def_node_image_user(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7090,7 +7090,7 @@ static void def_node_image_user(StructRNA *srna) RNA_def_property_ui_text(prop, "Has View", "True if this image has multiple views"); } -static void def_cmp_image(StructRNA *srna) +static void def_cmp_image(BlenderRNA *brna, StructRNA *srna) { PropertyRNA *prop; @@ -7123,10 +7123,10 @@ static void def_cmp_image(StructRNA *srna) * to trigger correct updates of the node editor. RNA design problem that prevents * updates from nested structs. */ RNA_def_struct_sdna_from(srna, "ImageUser", "storage"); - def_node_image_user(srna); + def_node_image_user(brna, srna); } -static void def_cmp_render_layers(StructRNA *srna) +static void def_cmp_render_layers(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7301,7 +7301,7 @@ static void def_cmp_output_file(BlenderRNA *brna, StructRNA *srna) rna_def_cmp_output_file_slots_api(brna, prop, "CompositorNodeOutputFileLayerSlots"); } -static void def_cmp_dilate_erode(StructRNA *srna) +static void def_cmp_dilate_erode(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7346,7 +7346,7 @@ static void def_cmp_dilate_erode(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_inpaint(StructRNA *srna) +static void def_cmp_inpaint(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7366,7 +7366,7 @@ static void def_cmp_inpaint(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_despeckle(StructRNA *srna) +static void def_cmp_despeckle(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7384,7 +7384,7 @@ static void def_cmp_despeckle(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_scale(StructRNA *srna) +static void def_cmp_scale(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7428,7 +7428,7 @@ static void def_cmp_scale(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_rotate(StructRNA *srna) +static void def_cmp_rotate(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7439,7 +7439,7 @@ static void def_cmp_rotate(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_diff_matte(StructRNA *srna) +static void def_cmp_diff_matte(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7461,7 +7461,7 @@ static void def_cmp_diff_matte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_color_matte(StructRNA *srna) +static void def_cmp_color_matte(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7486,7 +7486,7 @@ static void def_cmp_color_matte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_distance_matte(StructRNA *srna) +static void def_cmp_distance_matte(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7520,7 +7520,7 @@ static void def_cmp_distance_matte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_convert_color_space(StructRNA *srna) +static void def_cmp_convert_color_space(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; RNA_def_struct_sdna_from(srna, "NodeConvertColorSpace", "storage"); @@ -7546,7 +7546,7 @@ static void def_cmp_convert_color_space(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_color_spill(StructRNA *srna) +static void def_cmp_color_spill(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7625,7 +7625,7 @@ static void def_cmp_color_spill(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_luma_matte(StructRNA *srna) +static void def_cmp_luma_matte(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7646,7 +7646,7 @@ static void def_cmp_luma_matte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_brightcontrast(StructRNA *srna) +static void def_cmp_brightcontrast(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7656,7 +7656,7 @@ static void def_cmp_brightcontrast(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_chroma_matte(StructRNA *srna) +static void def_cmp_chroma_matte(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7698,7 +7698,7 @@ static void def_cmp_chroma_matte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_channel_matte(StructRNA *srna) +static void def_cmp_channel_matte(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7761,7 +7761,7 @@ static void def_cmp_channel_matte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_flip(StructRNA *srna) +static void def_cmp_flip(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7772,7 +7772,7 @@ static void def_cmp_flip(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_split(StructRNA *srna) +static void def_cmp_split(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7789,7 +7789,7 @@ static void def_cmp_split(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_id_mask(StructRNA *srna) +static void def_cmp_id_mask(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7805,7 +7805,7 @@ static void def_cmp_id_mask(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_double_edge_mask(StructRNA *srna) +static void def_cmp_double_edge_mask(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7839,7 +7839,7 @@ static void def_cmp_double_edge_mask(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_map_uv(StructRNA *srna) +static void def_cmp_map_uv(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7863,7 +7863,7 @@ static void def_cmp_map_uv(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_defocus(StructRNA *srna) +static void def_cmp_defocus(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7958,7 +7958,7 @@ static void def_cmp_defocus(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_invert(StructRNA *srna) +static void def_cmp_invert(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -7973,7 +7973,7 @@ static void def_cmp_invert(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_crop(StructRNA *srna) +static void def_cmp_crop(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8046,7 +8046,7 @@ static void def_cmp_crop(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_dblur(StructRNA *srna) +static void def_cmp_dblur(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8095,7 +8095,7 @@ static void def_cmp_dblur(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_bilateral_blur(StructRNA *srna) +static void def_cmp_bilateral_blur(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8120,7 +8120,7 @@ static void def_cmp_bilateral_blur(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_premul_key(StructRNA *srna) +static void def_cmp_premul_key(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8138,7 +8138,7 @@ static void def_cmp_premul_key(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_glare(StructRNA *srna) +static void def_cmp_glare(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8243,7 +8243,7 @@ static void def_cmp_glare(StructRNA *srna) "area of pixels). (Deprecated: Use Size input instead)"); } -static void def_cmp_tonemap(StructRNA *srna) +static void def_cmp_tonemap(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8313,7 +8313,7 @@ static void def_cmp_tonemap(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_lensdist(StructRNA *srna) +static void def_cmp_lensdist(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8342,7 +8342,7 @@ static void def_cmp_lensdist(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_colorbalance(StructRNA *srna) +static void def_cmp_colorbalance(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; static float default_1[3] = {1.0f, 1.0f, 1.0f}; @@ -8490,7 +8490,7 @@ static void def_cmp_colorbalance(StructRNA *srna) RNA_def_property_update(prop, NC_WINDOW, "rna_Node_update"); } -static void def_cmp_huecorrect(StructRNA *srna) +static void def_cmp_huecorrect(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8501,7 +8501,7 @@ static void def_cmp_huecorrect(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_zcombine(StructRNA *srna) +static void def_cmp_zcombine(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8520,7 +8520,7 @@ static void def_cmp_zcombine(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_ycc(StructRNA *srna) +static void def_cmp_ycc(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8531,7 +8531,7 @@ static void def_cmp_ycc(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_combsep_color(StructRNA *srna) +static void def_cmp_combsep_color(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem mode_items[] = { {CMP_NODE_COMBSEP_COLOR_RGB, "RGB", ICON_NONE, "RGB", "Use RGB color processing"}, @@ -8557,7 +8557,7 @@ static void def_cmp_combsep_color(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_movieclip(StructRNA *srna) +static void def_cmp_movieclip(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8572,7 +8572,7 @@ static void def_cmp_movieclip(StructRNA *srna) RNA_def_struct_sdna_from(srna, "MovieClipUser", "storage"); } -static void def_cmp_stabilize2d(StructRNA *srna) +static void def_cmp_stabilize2d(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8597,7 +8597,7 @@ static void def_cmp_stabilize2d(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_moviedistortion(StructRNA *srna) +static void def_cmp_moviedistortion(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8622,7 +8622,7 @@ static void def_cmp_moviedistortion(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_mask(StructRNA *srna) +static void def_cmp_mask(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8687,7 +8687,7 @@ static void def_cmp_mask(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void dev_cmd_transform(StructRNA *srna) +static void dev_cmd_transform(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8708,7 +8708,7 @@ static const EnumPropertyItem node_masktype_items[] = { {0, nullptr, 0, nullptr, nullptr}, }; -static void def_cmp_boxmask(StructRNA *srna) +static void def_cmp_boxmask(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8756,7 +8756,7 @@ static void def_cmp_boxmask(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_ellipsemask(StructRNA *srna) +static void def_cmp_ellipsemask(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; prop = RNA_def_property(srna, "mask_type", PROP_ENUM, PROP_NONE); @@ -8803,7 +8803,7 @@ static void def_cmp_ellipsemask(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_bokehblur(StructRNA *srna) +static void def_cmp_bokehblur(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8839,7 +8839,7 @@ static void def_cmp_bokehblur(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_bokehimage(StructRNA *srna) +static void def_cmp_bokehimage(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8881,7 +8881,7 @@ static void def_cmp_bokehimage(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_switch(StructRNA *srna) +static void def_cmp_switch(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -8891,9 +8891,9 @@ static void def_cmp_switch(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_switch_view(StructRNA * /*srna*/) {} +static void def_cmp_switch_view(BlenderRNA * /*brna*/, StructRNA * /*srna*/) {} -static void def_cmp_colorcorrection(StructRNA *srna) +static void def_cmp_colorcorrection(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; prop = RNA_def_property(srna, "red", PROP_BOOLEAN, PROP_NONE); @@ -9072,7 +9072,7 @@ static void def_cmp_colorcorrection(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_viewer(StructRNA *srna) +static void def_cmp_viewer(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9085,7 +9085,7 @@ static void def_cmp_viewer(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_composite(StructRNA *srna) +static void def_cmp_composite(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9098,7 +9098,7 @@ static void def_cmp_composite(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_keyingscreen(StructRNA *srna) +static void def_cmp_keyingscreen(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9124,7 +9124,7 @@ static void def_cmp_keyingscreen(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_keying(StructRNA *srna) +static void def_cmp_keying(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9223,7 +9223,7 @@ static void def_cmp_keying(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_trackpos(StructRNA *srna) +static void def_cmp_trackpos(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9284,7 +9284,7 @@ static void def_cmp_trackpos(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_pixelate(StructRNA *srna) +static void def_cmp_pixelate(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9299,7 +9299,7 @@ static void def_cmp_pixelate(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_translate(StructRNA *srna) +static void def_cmp_translate(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem translate_items[] = { {CMP_NODE_WRAP_NONE, "NONE", 0, "None", "No wrapping on X and Y"}, @@ -9341,7 +9341,7 @@ static void def_cmp_translate(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_planetrackdeform(StructRNA *srna) +static void def_cmp_planetrackdeform(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9382,7 +9382,7 @@ static void def_cmp_planetrackdeform(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_sunbeams(StructRNA *srna) +static void def_cmp_sunbeams(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9422,7 +9422,7 @@ static void def_cmp_cryptomatte_entry(BlenderRNA *brna) RNA_def_struct_name_property(srna, prop); } -static void def_cmp_cryptomatte_common(StructRNA *srna) +static void def_cmp_cryptomatte_common(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; static float default_1[3] = {1.0f, 1.0f, 1.0f}; @@ -9457,13 +9457,13 @@ static void def_cmp_cryptomatte_common(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeCryptomatte_update_remove"); } -static void def_cmp_cryptomatte_legacy(StructRNA *srna) +static void def_cmp_cryptomatte_legacy(BlenderRNA *brna, StructRNA *srna) { RNA_def_struct_sdna_from(srna, "NodeCryptomatte", "storage"); - def_cmp_cryptomatte_common(srna); + def_cmp_cryptomatte_common(brna, srna); } -static void def_cmp_cryptomatte(StructRNA *srna) +static void def_cmp_cryptomatte(BlenderRNA *brna, StructRNA *srna) { PropertyRNA *prop; @@ -9509,7 +9509,7 @@ static void def_cmp_cryptomatte(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update_relations"); RNA_def_struct_sdna_from(srna, "NodeCryptomatte", "storage"); - def_cmp_cryptomatte_common(srna); + def_cmp_cryptomatte_common(brna, srna); prop = RNA_def_property(srna, "layer_name", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, node_cryptomatte_layer_name_items); @@ -9532,10 +9532,10 @@ static void def_cmp_cryptomatte(StructRNA *srna) * storage type, so we can cast node->storage to ImageUser. * That is required since we can't define the properties from storage->iuser directly... */ RNA_def_struct_sdna_from(srna, "ImageUser", "storage"); - def_node_image_user(srna); + def_node_image_user(brna, srna); } -static void def_cmp_denoise(StructRNA *srna) +static void def_cmp_denoise(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9595,7 +9595,7 @@ static void def_cmp_denoise(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_kuwahara(StructRNA *srna) +static void def_cmp_kuwahara(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9653,7 +9653,7 @@ static void def_cmp_kuwahara(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_antialiasing(StructRNA *srna) +static void def_cmp_antialiasing(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9690,7 +9690,7 @@ static void def_cmp_antialiasing(StructRNA *srna) /* -- Texture Nodes --------------------------------------------------------- */ -static void def_tex_output(StructRNA *srna) +static void def_tex_output(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9702,7 +9702,7 @@ static void def_tex_output(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_tex_image(StructRNA *srna) +static void def_tex_image(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9722,7 +9722,7 @@ static void def_tex_image(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_tex_bricks(StructRNA *srna) +static void def_tex_bricks(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9758,7 +9758,7 @@ static void def_tex_bricks(StructRNA *srna) /* -- Geometry Nodes --------------------------------------------------------- */ -static void def_geo_curve_sample(StructRNA *srna) +static void def_geo_curve_sample(BlenderRNA * /*brna*/, StructRNA *srna) { static EnumPropertyItem mode_items[] = { {GEO_NODE_CURVE_SAMPLE_FACTOR, @@ -9801,7 +9801,7 @@ static void def_geo_curve_sample(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_fn_random_value(StructRNA *srna) +static void def_fn_random_value(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9816,7 +9816,7 @@ static void def_fn_random_value(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_geo_distribute_points_on_faces(StructRNA *srna) +static void def_geo_distribute_points_on_faces(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9853,7 +9853,7 @@ static void def_geo_distribute_points_on_faces(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_geo_curve_set_handle_type(StructRNA *srna) +static void def_geo_curve_set_handle_type(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -9874,7 +9874,7 @@ static void def_geo_curve_set_handle_type(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_common_zone_input(StructRNA *srna) +static void def_common_zone_input(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; FunctionRNA *func; @@ -9899,25 +9899,25 @@ static void def_common_zone_input(StructRNA *srna) RNA_def_function_return(func, parm); } -static void def_geo_simulation_input(StructRNA *srna) +static void def_geo_simulation_input(BlenderRNA *brna, StructRNA *srna) { RNA_def_struct_sdna_from(srna, "NodeGeometrySimulationInput", "storage"); - def_common_zone_input(srna); + def_common_zone_input(brna, srna); } -static void def_geo_repeat_input(StructRNA *srna) +static void def_geo_repeat_input(BlenderRNA *brna, StructRNA *srna) { RNA_def_struct_sdna_from(srna, "NodeGeometryRepeatInput", "storage"); - def_common_zone_input(srna); + def_common_zone_input(brna, srna); } -static void def_geo_foreach_geometry_element_input(StructRNA *srna) +static void def_geo_foreach_geometry_element_input(BlenderRNA *brna, StructRNA *srna) { RNA_def_struct_sdna_from(srna, "NodeGeometryForeachGeometryElementInput", "storage"); - def_common_zone_input(srna); + def_common_zone_input(brna, srna); } static void rna_def_node_item_array_socket_item_common(StructRNA *srna, @@ -10066,7 +10066,7 @@ static void rna_def_geo_simulation_output_items(BlenderRNA *brna) rna_def_node_item_array_common_functions(srna, "SimulationStateItem", "SimulationItemsAccessor"); } -static void def_geo_simulation_output(StructRNA *srna) +static void def_geo_simulation_output(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10118,7 +10118,7 @@ static void rna_def_geo_repeat_output_items(BlenderRNA *brna) rna_def_node_item_array_common_functions(srna, "RepeatItem", "RepeatItemsAccessor"); } -static void def_geo_repeat_output(StructRNA *srna) +static void def_geo_repeat_output(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10245,7 +10245,7 @@ static void rna_def_geo_foreach_geometry_element_generation_items(BlenderRNA *br "ForeachGeometryElementGenerationItemsAccessor"); } -static void def_geo_foreach_geometry_element_output(StructRNA *srna) +static void def_geo_foreach_geometry_element_output(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10331,7 +10331,7 @@ static void rna_def_geo_capture_attribute_items(BlenderRNA *brna) srna, "NodeGeometryCaptureAttributeItem", "CaptureAttributeItemsAccessor"); } -static void rna_def_geo_capture_attribute(StructRNA *srna) +static void rna_def_geo_capture_attribute(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10409,7 +10409,7 @@ static void rna_def_bake_items(BlenderRNA *brna) rna_def_node_item_array_common_functions(srna, "NodeGeometryBakeItem", "BakeItemsAccessor"); } -static void rna_def_geo_bake(StructRNA *srna) +static void rna_def_geo_bake(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10476,7 +10476,7 @@ static void rna_def_geo_index_switch_items(BlenderRNA *brna) rna_def_node_item_array_common_functions(srna, "IndexSwitchItem", "IndexSwitchItemsAccessor"); } -static void def_geo_index_switch(StructRNA *srna) +static void def_geo_index_switch(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10489,7 +10489,7 @@ static void def_geo_index_switch(StructRNA *srna) RNA_def_property_srna(prop, "NodeIndexSwitchItems"); } -static void def_geo_curve_handle_type_selection(StructRNA *srna) +static void def_geo_curve_handle_type_selection(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10508,7 +10508,7 @@ static void def_geo_curve_handle_type_selection(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_fn_rotate_euler(StructRNA *srna) +static void def_fn_rotate_euler(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem type_items[] = { {FN_NODE_ROTATE_EULER_TYPE_AXIS_ANGLE, @@ -10553,7 +10553,7 @@ static void def_fn_rotate_euler(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_geo_sample_index(StructRNA *srna) +static void def_geo_sample_index(BlenderRNA * /*brna*/, StructRNA *srna) { using namespace blender; PropertyRNA *prop; @@ -10585,7 +10585,7 @@ static void def_geo_sample_index(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_geo_input_material(StructRNA *srna) +static void def_geo_input_material(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10598,7 +10598,7 @@ static void def_geo_input_material(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_geo_input_collection(StructRNA *srna) +static void def_geo_input_collection(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10611,7 +10611,7 @@ static void def_geo_input_collection(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_geo_input_object(StructRNA *srna) +static void def_geo_input_object(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10624,7 +10624,7 @@ static void def_geo_input_object(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_geo_image(StructRNA *srna) +static void def_geo_image(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10636,7 +10636,7 @@ static void def_geo_image(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_geo_string_to_curves(StructRNA *srna) +static void def_geo_string_to_curves(BlenderRNA * /*brna*/, StructRNA *srna) { static const EnumPropertyItem rna_node_geometry_string_to_curves_overflow_items[] = { {GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW, @@ -10834,7 +10834,7 @@ static void rna_def_geo_menu_switch_items(BlenderRNA *brna) rna_def_node_item_array_common_functions(srna, "NodeEnumItem", "MenuSwitchItemsAccessor"); } -static void def_geo_menu_switch(StructRNA *srna) +static void def_geo_menu_switch(BlenderRNA * /*brna*/, StructRNA *srna) { PropertyRNA *prop; @@ -10936,7 +10936,7 @@ static void rna_def_function_node(BlenderRNA *brna) /* -------------------------------------------------------------------------- */ -static void def_reroute(StructRNA *srna) +static void def_reroute(BlenderRNA * /*brna*/, StructRNA *srna) { RNA_def_struct_sdna_from(srna, "NodeReroute", "storage"); @@ -11969,19 +11969,12 @@ static void rna_def_geometry_nodetree(BlenderRNA *brna) static StructRNA *define_specific_node(BlenderRNA *brna, const char *struct_name, - const char *base_name, - void (*def_func)(StructRNA *)) + const char *base_name) { StructRNA *srna; FunctionRNA *func; PropertyRNA *parm; - /* XXX hack, want to avoid "NodeInternal" prefix, - * so use "Node" in NOD_static_types.h and replace here */ - if (STREQ(base_name, "Node")) { - base_name = "NodeInternal"; - } - srna = RNA_def_struct(brna, struct_name, base_name); RNA_def_struct_sdna(srna, "bNode"); @@ -12016,10 +12009,6 @@ static StructRNA *define_specific_node(BlenderRNA *brna, RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_RNAPTR); RNA_def_function_return(func, parm); - if (def_func) { - def_func(srna); - } - return srna; } @@ -12036,10 +12025,525 @@ static void rna_def_node_instance_hash(BlenderRNA *brna) */ } +static void rna_def_nodes(BlenderRNA *brna) +{ + const auto define = [&](const char *base_name, + const char *struct_name, + void (*func)(BlenderRNA *, StructRNA *) = nullptr) { + StructRNA *srna = define_specific_node(brna, struct_name, base_name); + if (func) { + func(brna, srna); + } + }; + + /* Disabling clang-format because: + * - It's more readable when the lines are aligned. + * - It's easier to sort the lines alphabetically with automated tools. Keeping the lines sorted + * avoids merge conflicts in many cases when multiple people add nodes at the same time. + */ + /* clang-format off */ + + define("NodeInternal", "NodeFrame", def_frame); + define("NodeInternal", "NodeGroup", def_group); + define("NodeInternal", "NodeGroupInput", def_group_input); + define("NodeInternal", "NodeGroupOutput", def_group_output); + define("NodeInternal", "NodeReroute", def_reroute); + + define("ShaderNode", "ShaderNodeAddShader"); + define("ShaderNode", "ShaderNodeAmbientOcclusion", def_sh_ambient_occlusion); + define("ShaderNode", "ShaderNodeAttribute", def_sh_attribute); + define("ShaderNode", "ShaderNodeBackground"); + define("ShaderNode", "ShaderNodeBevel", def_sh_bevel); + define("ShaderNode", "ShaderNodeBlackbody"); + define("ShaderNode", "ShaderNodeBrightContrast"); + define("ShaderNode", "ShaderNodeBsdfAnisotropic", def_glossy); + define("ShaderNode", "ShaderNodeBsdfDiffuse"); + define("ShaderNode", "ShaderNodeBsdfGlass", def_glass); + define("ShaderNode", "ShaderNodeBsdfHair", def_hair); + define("ShaderNode", "ShaderNodeBsdfHairPrincipled", def_hair_principled); + define("ShaderNode", "ShaderNodeBsdfMetallic", def_metallic); + define("ShaderNode", "ShaderNodeBsdfPrincipled", def_principled); + define("ShaderNode", "ShaderNodeBsdfRayPortal"); + define("ShaderNode", "ShaderNodeBsdfRefraction", def_refraction); + define("ShaderNode", "ShaderNodeBsdfSheen", def_sheen); + define("ShaderNode", "ShaderNodeBsdfToon", def_toon); + define("ShaderNode", "ShaderNodeBsdfTranslucent"); + define("ShaderNode", "ShaderNodeBsdfTransparent"); + define("ShaderNode", "ShaderNodeBump", def_sh_bump); + define("ShaderNode", "ShaderNodeCameraData"); + define("ShaderNode", "ShaderNodeClamp", def_clamp); + define("ShaderNode", "ShaderNodeCombineColor", def_sh_combsep_color); + define("ShaderNode", "ShaderNodeCombineHSV"); + define("ShaderNode", "ShaderNodeCombineRGB"); + define("ShaderNode", "ShaderNodeCombineXYZ"); + define("ShaderNode", "ShaderNodeDisplacement", def_sh_displacement); + define("ShaderNode", "ShaderNodeEeveeSpecular"); + define("ShaderNode", "ShaderNodeEmission"); + define("ShaderNode", "ShaderNodeFloatCurve", def_float_curve); + define("ShaderNode", "ShaderNodeFresnel"); + define("ShaderNode", "ShaderNodeGamma"); + define("ShaderNode", "ShaderNodeHairInfo"); + define("ShaderNode", "ShaderNodeHoldout"); + define("ShaderNode", "ShaderNodeHueSaturation"); + define("ShaderNode", "ShaderNodeInvert"); + define("ShaderNode", "ShaderNodeLayerWeight"); + define("ShaderNode", "ShaderNodeLightFalloff"); + define("ShaderNode", "ShaderNodeLightPath"); + define("ShaderNode", "ShaderNodeMapping", def_sh_mapping); + define("ShaderNode", "ShaderNodeMapRange", def_map_range); + define("ShaderNode", "ShaderNodeMath", def_math); + define("ShaderNode", "ShaderNodeMix", def_sh_mix); + define("ShaderNode", "ShaderNodeMixRGB", def_mix_rgb); + define("ShaderNode", "ShaderNodeMixShader"); + define("ShaderNode", "ShaderNodeNewGeometry"); + define("ShaderNode", "ShaderNodeNormal"); + define("ShaderNode", "ShaderNodeNormalMap", def_sh_normal_map); + define("ShaderNode", "ShaderNodeObjectInfo"); + define("ShaderNode", "ShaderNodeOutputAOV", def_sh_output_aov); + define("ShaderNode", "ShaderNodeOutputLight", def_sh_output); + define("ShaderNode", "ShaderNodeOutputLineStyle", def_sh_output_linestyle); + define("ShaderNode", "ShaderNodeOutputMaterial", def_sh_output); + define("ShaderNode", "ShaderNodeOutputWorld", def_sh_output); + define("ShaderNode", "ShaderNodeParticleInfo"); + define("ShaderNode", "ShaderNodePointInfo"); + define("ShaderNode", "ShaderNodeRGB"); + define("ShaderNode", "ShaderNodeRGBCurve", def_rgb_curve); + define("ShaderNode", "ShaderNodeRGBToBW"); + define("ShaderNode", "ShaderNodeScript", def_sh_script); + define("ShaderNode", "ShaderNodeSeparateColor", def_sh_combsep_color); + define("ShaderNode", "ShaderNodeSeparateHSV"); + define("ShaderNode", "ShaderNodeSeparateRGB"); + define("ShaderNode", "ShaderNodeSeparateXYZ"); + define("ShaderNode", "ShaderNodeShaderToRGB"); + define("ShaderNode", "ShaderNodeSqueeze"); + define("ShaderNode", "ShaderNodeSubsurfaceScattering", def_sh_subsurface); + define("ShaderNode", "ShaderNodeTangent", def_sh_tangent); + define("ShaderNode", "ShaderNodeTexBrick", def_sh_tex_brick); + define("ShaderNode", "ShaderNodeTexChecker", def_sh_tex_checker); + define("ShaderNode", "ShaderNodeTexCoord", def_sh_tex_coord); + define("ShaderNode", "ShaderNodeTexEnvironment", def_sh_tex_environment); + define("ShaderNode", "ShaderNodeTexGabor", def_sh_tex_gabor); + define("ShaderNode", "ShaderNodeTexGradient", def_sh_tex_gradient); + define("ShaderNode", "ShaderNodeTexIES", def_sh_tex_ies); + define("ShaderNode", "ShaderNodeTexImage", def_sh_tex_image); + define("ShaderNode", "ShaderNodeTexMagic", def_sh_tex_magic); + define("ShaderNode", "ShaderNodeTexNoise", def_sh_tex_noise); + define("ShaderNode", "ShaderNodeTexPointDensity", def_sh_tex_pointdensity); + define("ShaderNode", "ShaderNodeTexSky", def_sh_tex_sky); + define("ShaderNode", "ShaderNodeTexVoronoi", def_sh_tex_voronoi); + define("ShaderNode", "ShaderNodeTexWave", def_sh_tex_wave); + define("ShaderNode", "ShaderNodeTexWhiteNoise", def_sh_tex_white_noise); + define("ShaderNode", "ShaderNodeUVAlongStroke", def_sh_uvalongstroke); + define("ShaderNode", "ShaderNodeUVMap", def_sh_uvmap); + define("ShaderNode", "ShaderNodeValToRGB", def_colorramp); + define("ShaderNode", "ShaderNodeValue"); + define("ShaderNode", "ShaderNodeVectorCurve", def_vector_curve); + define("ShaderNode", "ShaderNodeVectorDisplacement", def_sh_vector_displacement); + define("ShaderNode", "ShaderNodeVectorMath", def_vector_math); + define("ShaderNode", "ShaderNodeVectorRotate", def_sh_vector_rotate); + define("ShaderNode", "ShaderNodeVectorTransform", def_sh_vect_transform); + define("ShaderNode", "ShaderNodeVertexColor", def_sh_vertex_color); + define("ShaderNode", "ShaderNodeVolumeAbsorption"); + define("ShaderNode", "ShaderNodeVolumeInfo"); + define("ShaderNode", "ShaderNodeVolumePrincipled"); + define("ShaderNode", "ShaderNodeVolumeScatter", def_scatter); + define("ShaderNode", "ShaderNodeWavelength"); + define("ShaderNode", "ShaderNodeWireframe", def_sh_tex_wireframe); + + define("CompositorNode", "CompositorNodeAlphaOver", def_cmp_alpha_over); + define("CompositorNode", "CompositorNodeAntiAliasing", def_cmp_antialiasing); + define("CompositorNode", "CompositorNodeBilateralblur", def_cmp_bilateral_blur); + define("CompositorNode", "CompositorNodeBlur", def_cmp_blur); + define("CompositorNode", "CompositorNodeBokehBlur", def_cmp_bokehblur); + define("CompositorNode", "CompositorNodeBokehImage", def_cmp_bokehimage); + define("CompositorNode", "CompositorNodeBoxMask", def_cmp_boxmask); + define("CompositorNode", "CompositorNodeBrightContrast", def_cmp_brightcontrast); + define("CompositorNode", "CompositorNodeChannelMatte", def_cmp_channel_matte); + define("CompositorNode", "CompositorNodeChromaMatte", def_cmp_chroma_matte); + define("CompositorNode", "CompositorNodeColorBalance", def_cmp_colorbalance); + define("CompositorNode", "CompositorNodeColorCorrection", def_cmp_colorcorrection); + define("CompositorNode", "CompositorNodeColorMatte", def_cmp_color_matte); + define("CompositorNode", "CompositorNodeColorSpill", def_cmp_color_spill); + define("CompositorNode", "CompositorNodeCombHSVA"); + define("CompositorNode", "CompositorNodeCombineColor", def_cmp_combsep_color); + define("CompositorNode", "CompositorNodeCombineXYZ"); + define("CompositorNode", "CompositorNodeCombRGBA"); + define("CompositorNode", "CompositorNodeCombYCCA", def_cmp_ycc); + define("CompositorNode", "CompositorNodeCombYUVA"); + define("CompositorNode", "CompositorNodeComposite", def_cmp_composite); + define("CompositorNode", "CompositorNodeConvertColorSpace", def_cmp_convert_color_space); + define("CompositorNode", "CompositorNodeCornerPin"); + define("CompositorNode", "CompositorNodeCrop", def_cmp_crop); + define("CompositorNode", "CompositorNodeCryptomatte", def_cmp_cryptomatte_legacy); + define("CompositorNode", "CompositorNodeCryptomatteV2", def_cmp_cryptomatte); + define("CompositorNode", "CompositorNodeCurveRGB", def_rgb_curve); + define("CompositorNode", "CompositorNodeCurveVec", def_vector_curve); + define("CompositorNode", "CompositorNodeDBlur", def_cmp_dblur); + define("CompositorNode", "CompositorNodeDefocus", def_cmp_defocus); + define("CompositorNode", "CompositorNodeDenoise", def_cmp_denoise); + define("CompositorNode", "CompositorNodeDespeckle", def_cmp_despeckle); + define("CompositorNode", "CompositorNodeDiffMatte", def_cmp_diff_matte); + define("CompositorNode", "CompositorNodeDilateErode", def_cmp_dilate_erode); + define("CompositorNode", "CompositorNodeDisplace"); + define("CompositorNode", "CompositorNodeDistanceMatte", def_cmp_distance_matte); + define("CompositorNode", "CompositorNodeDoubleEdgeMask", def_cmp_double_edge_mask); + define("CompositorNode", "CompositorNodeEllipseMask", def_cmp_ellipsemask); + define("CompositorNode", "CompositorNodeExposure"); + define("CompositorNode", "CompositorNodeFilter", def_cmp_filter); + define("CompositorNode", "CompositorNodeFlip", def_cmp_flip); + define("CompositorNode", "CompositorNodeGamma"); + define("CompositorNode", "CompositorNodeGlare", def_cmp_glare); + define("CompositorNode", "CompositorNodeHueCorrect", def_cmp_huecorrect); + define("CompositorNode", "CompositorNodeHueSat"); + define("CompositorNode", "CompositorNodeIDMask", def_cmp_id_mask); + define("CompositorNode", "CompositorNodeImage", def_cmp_image); + define("CompositorNode", "CompositorNodeInpaint", def_cmp_inpaint); + define("CompositorNode", "CompositorNodeInvert", def_cmp_invert); + define("CompositorNode", "CompositorNodeKeying", def_cmp_keying); + define("CompositorNode", "CompositorNodeKeyingScreen", def_cmp_keyingscreen); + define("CompositorNode", "CompositorNodeKuwahara", def_cmp_kuwahara); + define("CompositorNode", "CompositorNodeLensdist", def_cmp_lensdist); + define("CompositorNode", "CompositorNodeLevels", def_cmp_levels); + define("CompositorNode", "CompositorNodeLumaMatte", def_cmp_luma_matte); + define("CompositorNode", "CompositorNodeMapRange", def_cmp_map_range); + define("CompositorNode", "CompositorNodeMapUV", def_cmp_map_uv); + define("CompositorNode", "CompositorNodeMapValue", def_cmp_map_value); + define("CompositorNode", "CompositorNodeMask", def_cmp_mask); + define("CompositorNode", "CompositorNodeMath", def_math); + define("CompositorNode", "CompositorNodeMixRGB", def_mix_rgb); + define("CompositorNode", "CompositorNodeMovieClip", def_cmp_movieclip); + define("CompositorNode", "CompositorNodeMovieDistortion", def_cmp_moviedistortion); + define("CompositorNode", "CompositorNodeNormal"); + define("CompositorNode", "CompositorNodeNormalize"); + define("CompositorNode", "CompositorNodeOutputFile", def_cmp_output_file); + define("CompositorNode", "CompositorNodePixelate", def_cmp_pixelate); + define("CompositorNode", "CompositorNodePlaneTrackDeform", def_cmp_planetrackdeform); + define("CompositorNode", "CompositorNodePosterize"); + define("CompositorNode", "CompositorNodePremulKey", def_cmp_premul_key); + define("CompositorNode", "CompositorNodeRGB"); + define("CompositorNode", "CompositorNodeRGBToBW"); + define("CompositorNode", "CompositorNodeRLayers", def_cmp_render_layers); + define("CompositorNode", "CompositorNodeRotate", def_cmp_rotate); + define("CompositorNode", "CompositorNodeScale", def_cmp_scale); + define("CompositorNode", "CompositorNodeSceneTime"); + define("CompositorNode", "CompositorNodeSeparateColor", def_cmp_combsep_color); + define("CompositorNode", "CompositorNodeSeparateXYZ"); + define("CompositorNode", "CompositorNodeSepHSVA"); + define("CompositorNode", "CompositorNodeSepRGBA"); + define("CompositorNode", "CompositorNodeSepYCCA", def_cmp_ycc); + define("CompositorNode", "CompositorNodeSepYUVA"); + define("CompositorNode", "CompositorNodeSetAlpha", def_cmp_set_alpha); + define("CompositorNode", "CompositorNodeSplit", def_cmp_split); + define("CompositorNode", "CompositorNodeStabilize", def_cmp_stabilize2d); + define("CompositorNode", "CompositorNodeSunBeams", def_cmp_sunbeams); + define("CompositorNode", "CompositorNodeSwitch", def_cmp_switch); + define("CompositorNode", "CompositorNodeSwitchView", def_cmp_switch_view); + define("CompositorNode", "CompositorNodeTexture", def_texture); + define("CompositorNode", "CompositorNodeTime", def_time); + define("CompositorNode", "CompositorNodeTonemap", def_cmp_tonemap); + define("CompositorNode", "CompositorNodeTrackPos", def_cmp_trackpos); + define("CompositorNode", "CompositorNodeTransform", dev_cmd_transform); + define("CompositorNode", "CompositorNodeTranslate", def_cmp_translate); + define("CompositorNode", "CompositorNodeValToRGB", def_colorramp); + define("CompositorNode", "CompositorNodeValue"); + define("CompositorNode", "CompositorNodeVecBlur", def_cmp_vector_blur); + define("CompositorNode", "CompositorNodeViewer", def_cmp_viewer); + define("CompositorNode", "CompositorNodeZcombine", def_cmp_zcombine); + + define("TextureNode", "TextureNodeAt"); + define("TextureNode", "TextureNodeBricks", def_tex_bricks); + define("TextureNode", "TextureNodeChecker"); + define("TextureNode", "TextureNodeCombineColor", def_tex_combsep_color); + define("TextureNode", "TextureNodeCompose"); + define("TextureNode", "TextureNodeCoordinates"); + define("TextureNode", "TextureNodeCurveRGB", def_rgb_curve); + define("TextureNode", "TextureNodeCurveTime", def_time); + define("TextureNode", "TextureNodeDecompose"); + define("TextureNode", "TextureNodeDistance"); + define("TextureNode", "TextureNodeHueSaturation"); + define("TextureNode", "TextureNodeImage", def_tex_image); + define("TextureNode", "TextureNodeInvert"); + define("TextureNode", "TextureNodeMath", def_math); + define("TextureNode", "TextureNodeMixRGB", def_mix_rgb); + define("TextureNode", "TextureNodeOutput", def_tex_output); + define("TextureNode", "TextureNodeRGBToBW"); + define("TextureNode", "TextureNodeRotate"); + define("TextureNode", "TextureNodeScale"); + define("TextureNode", "TextureNodeSeparateColor", def_tex_combsep_color); + define("TextureNode", "TextureNodeTexBlend"); + define("TextureNode", "TextureNodeTexClouds"); + define("TextureNode", "TextureNodeTexDistNoise"); + define("TextureNode", "TextureNodeTexMagic"); + define("TextureNode", "TextureNodeTexMarble"); + define("TextureNode", "TextureNodeTexMusgrave"); + define("TextureNode", "TextureNodeTexNoise"); + define("TextureNode", "TextureNodeTexStucci"); + define("TextureNode", "TextureNodeTexture", def_texture); + define("TextureNode", "TextureNodeTexVoronoi"); + define("TextureNode", "TextureNodeTexWood"); + define("TextureNode", "TextureNodeTranslate"); + define("TextureNode", "TextureNodeValToNor"); + define("TextureNode", "TextureNodeValToRGB", def_colorramp); + define("TextureNode", "TextureNodeViewer"); + + define("FunctionNode", "FunctionNodeAlignEulerToVector"); + define("FunctionNode", "FunctionNodeAlignRotationToVector"); + define("FunctionNode", "FunctionNodeAxesToRotation"); + define("FunctionNode", "FunctionNodeAxisAngleToRotation"); + define("FunctionNode", "FunctionNodeBooleanMath"); + define("FunctionNode", "FunctionNodeCombineColor"); + define("FunctionNode", "FunctionNodeCombineMatrix"); + define("FunctionNode", "FunctionNodeCombineTransform"); + define("FunctionNode", "FunctionNodeCompare"); + define("FunctionNode", "FunctionNodeEulerToRotation"); + define("FunctionNode", "FunctionNodeFindInString"); + define("FunctionNode", "FunctionNodeFloatToInt", def_float_to_int); + define("FunctionNode", "FunctionNodeHashValue"); + define("FunctionNode", "FunctionNodeInputBool", def_fn_input_bool); + define("FunctionNode", "FunctionNodeInputColor", def_fn_input_color); + define("FunctionNode", "FunctionNodeInputInt", def_fn_input_int); + define("FunctionNode", "FunctionNodeInputRotation", def_fn_input_rotation); + define("FunctionNode", "FunctionNodeInputSpecialCharacters"); + define("FunctionNode", "FunctionNodeInputString", def_fn_input_string); + define("FunctionNode", "FunctionNodeInputVector", def_fn_input_vector); + define("FunctionNode", "FunctionNodeIntegerMath"); + define("FunctionNode", "FunctionNodeInvertMatrix"); + define("FunctionNode", "FunctionNodeInvertRotation"); + define("FunctionNode", "FunctionNodeMatrixDeterminant"); + define("FunctionNode", "FunctionNodeMatrixMultiply"); + define("FunctionNode", "FunctionNodeProjectPoint"); + define("FunctionNode", "FunctionNodeQuaternionToRotation"); + define("FunctionNode", "FunctionNodeRandomValue", def_fn_random_value); + define("FunctionNode", "FunctionNodeReplaceString"); + define("FunctionNode", "FunctionNodeRotateEuler", def_fn_rotate_euler); + define("FunctionNode", "FunctionNodeRotateRotation"); + define("FunctionNode", "FunctionNodeRotateVector"); + define("FunctionNode", "FunctionNodeRotationToAxisAngle"); + define("FunctionNode", "FunctionNodeRotationToEuler"); + define("FunctionNode", "FunctionNodeRotationToQuaternion"); + define("FunctionNode", "FunctionNodeSeparateColor"); + define("FunctionNode", "FunctionNodeSeparateMatrix"); + define("FunctionNode", "FunctionNodeSeparateTransform"); + define("FunctionNode", "FunctionNodeSliceString"); + define("FunctionNode", "FunctionNodeStringLength"); + define("FunctionNode", "FunctionNodeTransformDirection"); + define("FunctionNode", "FunctionNodeTransformPoint"); + define("FunctionNode", "FunctionNodeTransposeMatrix"); + define("FunctionNode", "FunctionNodeValueToString"); + + define("GeometryNode", "GeometryNodeAccumulateField"); + define("GeometryNode", "GeometryNodeAttributeDomainSize"); + define("GeometryNode", "GeometryNodeAttributeStatistic"); + define("GeometryNode", "GeometryNodeBake", rna_def_geo_bake); + define("GeometryNode", "GeometryNodeBlurAttribute"); + define("GeometryNode", "GeometryNodeBoundBox"); + define("GeometryNode", "GeometryNodeCaptureAttribute", rna_def_geo_capture_attribute); + define("GeometryNode", "GeometryNodeCollectionInfo"); + define("GeometryNode", "GeometryNodeConvexHull"); + define("GeometryNode", "GeometryNodeCornersOfEdge"); + define("GeometryNode", "GeometryNodeCornersOfFace"); + define("GeometryNode", "GeometryNodeCornersOfVertex"); + define("GeometryNode", "GeometryNodeCurveArc"); + define("GeometryNode", "GeometryNodeCurveEndpointSelection"); + define("GeometryNode", "GeometryNodeCurveHandleTypeSelection", def_geo_curve_handle_type_selection); + define("GeometryNode", "GeometryNodeCurveLength"); + define("GeometryNode", "GeometryNodeCurveOfPoint"); + define("GeometryNode", "GeometryNodeCurvePrimitiveBezierSegment"); + define("GeometryNode", "GeometryNodeCurvePrimitiveCircle"); + define("GeometryNode", "GeometryNodeCurvePrimitiveLine"); + define("GeometryNode", "GeometryNodeCurvePrimitiveQuadrilateral"); + define("GeometryNode", "GeometryNodeCurveQuadraticBezier"); + define("GeometryNode", "GeometryNodeCurveSetHandles", def_geo_curve_set_handle_type); + define("GeometryNode", "GeometryNodeCurveSpiral"); + define("GeometryNode", "GeometryNodeCurveSplineType"); + define("GeometryNode", "GeometryNodeCurveStar"); + define("GeometryNode", "GeometryNodeCurvesToGreasePencil"); + define("GeometryNode", "GeometryNodeCurveToMesh"); + define("GeometryNode", "GeometryNodeCurveToPoints"); + define("GeometryNode", "GeometryNodeDeformCurvesOnSurface"); + define("GeometryNode", "GeometryNodeDeleteGeometry"); + define("GeometryNode", "GeometryNodeDistributePointsInGrid"); + define("GeometryNode", "GeometryNodeDistributePointsInVolume"); + define("GeometryNode", "GeometryNodeDistributePointsOnFaces", def_geo_distribute_points_on_faces); + define("GeometryNode", "GeometryNodeDualMesh"); + define("GeometryNode", "GeometryNodeDuplicateElements"); + define("GeometryNode", "GeometryNodeEdgePathsToCurves"); + define("GeometryNode", "GeometryNodeEdgePathsToSelection"); + define("GeometryNode", "GeometryNodeEdgesOfCorner"); + define("GeometryNode", "GeometryNodeEdgesOfVertex"); + define("GeometryNode", "GeometryNodeEdgesToFaceGroups"); + define("GeometryNode", "GeometryNodeExtrudeMesh"); + define("GeometryNode", "GeometryNodeFaceOfCorner"); + define("GeometryNode", "GeometryNodeFieldAtIndex"); + define("GeometryNode", "GeometryNodeFieldOnDomain"); + define("GeometryNode", "GeometryNodeFillCurve"); + define("GeometryNode", "GeometryNodeFilletCurve"); + define("GeometryNode", "GeometryNodeFlipFaces"); + define("GeometryNode", "GeometryNodeForeachGeometryElementInput", def_geo_foreach_geometry_element_input); + define("GeometryNode", "GeometryNodeForeachGeometryElementOutput", def_geo_foreach_geometry_element_output); + define("GeometryNode", "GeometryNodeGeometryToInstance"); + define("GeometryNode", "GeometryNodeGetNamedGrid"); + define("GeometryNode", "GeometryNodeGizmoDial"); + define("GeometryNode", "GeometryNodeGizmoLinear"); + define("GeometryNode", "GeometryNodeGizmoTransform", rna_def_geo_gizmo_transform); + define("GeometryNode", "GeometryNodeGreasePencilToCurves"); + define("GeometryNode", "GeometryNodeGridToMesh"); + define("GeometryNode", "GeometryNodeImageInfo"); + define("GeometryNode", "GeometryNodeImageTexture", def_geo_image_texture); + define("GeometryNode", "GeometryNodeImportOBJ"); + define("GeometryNode", "GeometryNodeImportPLY"); + define("GeometryNode", "GeometryNodeImportSTL"); + define("GeometryNode", "GeometryNodeIndexOfNearest"); + define("GeometryNode", "GeometryNodeIndexSwitch", def_geo_index_switch); + define("GeometryNode", "GeometryNodeInputActiveCamera"); + define("GeometryNode", "GeometryNodeInputCollection", def_geo_input_collection); + define("GeometryNode", "GeometryNodeInputCurveHandlePositions"); + define("GeometryNode", "GeometryNodeInputCurveTilt"); + define("GeometryNode", "GeometryNodeInputEdgeSmooth"); + define("GeometryNode", "GeometryNodeInputID"); + define("GeometryNode", "GeometryNodeInputImage", def_geo_image); + define("GeometryNode", "GeometryNodeInputIndex"); + define("GeometryNode", "GeometryNodeInputInstanceRotation"); + define("GeometryNode", "GeometryNodeInputInstanceScale"); + define("GeometryNode", "GeometryNodeInputMaterial", def_geo_input_material); + define("GeometryNode", "GeometryNodeInputMaterialIndex"); + define("GeometryNode", "GeometryNodeInputMeshEdgeAngle"); + define("GeometryNode", "GeometryNodeInputMeshEdgeNeighbors"); + define("GeometryNode", "GeometryNodeInputMeshEdgeVertices"); + define("GeometryNode", "GeometryNodeInputMeshFaceArea"); + define("GeometryNode", "GeometryNodeInputMeshFaceIsPlanar"); + define("GeometryNode", "GeometryNodeInputMeshFaceNeighbors"); + define("GeometryNode", "GeometryNodeInputMeshIsland"); + define("GeometryNode", "GeometryNodeInputMeshVertexNeighbors"); + define("GeometryNode", "GeometryNodeInputNamedAttribute"); + define("GeometryNode", "GeometryNodeInputNamedLayerSelection"); + define("GeometryNode", "GeometryNodeInputNormal"); + define("GeometryNode", "GeometryNodeInputObject", def_geo_input_object); + define("GeometryNode", "GeometryNodeInputPosition"); + define("GeometryNode", "GeometryNodeInputRadius"); + define("GeometryNode", "GeometryNodeInputSceneTime"); + define("GeometryNode", "GeometryNodeInputShadeSmooth"); + define("GeometryNode", "GeometryNodeInputShortestEdgePaths"); + define("GeometryNode", "GeometryNodeInputSplineCyclic"); + define("GeometryNode", "GeometryNodeInputSplineResolution"); + define("GeometryNode", "GeometryNodeInputTangent"); + define("GeometryNode", "GeometryNodeInstanceOnPoints"); + define("GeometryNode", "GeometryNodeInstancesToPoints"); + define("GeometryNode", "GeometryNodeInstanceTransform"); + define("GeometryNode", "GeometryNodeInterpolateCurves"); + define("GeometryNode", "GeometryNodeIsViewport"); + define("GeometryNode", "GeometryNodeJoinGeometry"); + define("GeometryNode", "GeometryNodeMaterialSelection"); + define("GeometryNode", "GeometryNodeMenuSwitch", def_geo_menu_switch); + define("GeometryNode", "GeometryNodeMergeByDistance"); + define("GeometryNode", "GeometryNodeMergeLayers"); + define("GeometryNode", "GeometryNodeMeshBoolean"); + define("GeometryNode", "GeometryNodeMeshCircle"); + define("GeometryNode", "GeometryNodeMeshCone"); + define("GeometryNode", "GeometryNodeMeshCube"); + define("GeometryNode", "GeometryNodeMeshCylinder"); + define("GeometryNode", "GeometryNodeMeshFaceSetBoundaries"); + define("GeometryNode", "GeometryNodeMeshGrid"); + define("GeometryNode", "GeometryNodeMeshIcoSphere"); + define("GeometryNode", "GeometryNodeMeshLine"); + define("GeometryNode", "GeometryNodeMeshToCurve"); + define("GeometryNode", "GeometryNodeMeshToDensityGrid"); + define("GeometryNode", "GeometryNodeMeshToPoints"); + define("GeometryNode", "GeometryNodeMeshToSDFGrid"); + define("GeometryNode", "GeometryNodeMeshToVolume"); + define("GeometryNode", "GeometryNodeMeshUVSphere"); + define("GeometryNode", "GeometryNodeObjectInfo"); + define("GeometryNode", "GeometryNodeOffsetCornerInFace"); + define("GeometryNode", "GeometryNodeOffsetPointInCurve"); + define("GeometryNode", "GeometryNodePoints"); + define("GeometryNode", "GeometryNodePointsOfCurve"); + define("GeometryNode", "GeometryNodePointsToCurves"); + define("GeometryNode", "GeometryNodePointsToSDFGrid"); + define("GeometryNode", "GeometryNodePointsToVertices"); + define("GeometryNode", "GeometryNodePointsToVolume"); + define("GeometryNode", "GeometryNodeProximity"); + define("GeometryNode", "GeometryNodeRaycast"); + define("GeometryNode", "GeometryNodeRealizeInstances"); + define("GeometryNode", "GeometryNodeRemoveAttribute"); + define("GeometryNode", "GeometryNodeRepeatInput", def_geo_repeat_input); + define("GeometryNode", "GeometryNodeRepeatOutput", def_geo_repeat_output); + define("GeometryNode", "GeometryNodeReplaceMaterial"); + define("GeometryNode", "GeometryNodeResampleCurve"); + define("GeometryNode", "GeometryNodeReverseCurve"); + define("GeometryNode", "GeometryNodeRotateInstances"); + define("GeometryNode", "GeometryNodeSampleCurve", def_geo_curve_sample); + define("GeometryNode", "GeometryNodeSampleGrid"); + define("GeometryNode", "GeometryNodeSampleGridIndex"); + define("GeometryNode", "GeometryNodeSampleIndex", def_geo_sample_index); + define("GeometryNode", "GeometryNodeSampleNearest"); + define("GeometryNode", "GeometryNodeSampleNearestSurface"); + define("GeometryNode", "GeometryNodeSampleUVSurface"); + define("GeometryNode", "GeometryNodeScaleElements"); + define("GeometryNode", "GeometryNodeScaleInstances"); + define("GeometryNode", "GeometryNodeSDFGridBoolean"); + define("GeometryNode", "GeometryNodeSelfObject"); + define("GeometryNode", "GeometryNodeSeparateComponents"); + define("GeometryNode", "GeometryNodeSeparateGeometry"); + define("GeometryNode", "GeometryNodeSetCurveHandlePositions"); + define("GeometryNode", "GeometryNodeSetCurveNormal"); + define("GeometryNode", "GeometryNodeSetCurveRadius"); + define("GeometryNode", "GeometryNodeSetCurveTilt"); + define("GeometryNode", "GeometryNodeSetGeometryName"); + define("GeometryNode", "GeometryNodeSetID"); + define("GeometryNode", "GeometryNodeSetInstanceTransform"); + define("GeometryNode", "GeometryNodeSetMaterial"); + define("GeometryNode", "GeometryNodeSetMaterialIndex"); + define("GeometryNode", "GeometryNodeSetPointRadius"); + define("GeometryNode", "GeometryNodeSetPosition"); + define("GeometryNode", "GeometryNodeSetShadeSmooth"); + define("GeometryNode", "GeometryNodeSetSplineCyclic"); + define("GeometryNode", "GeometryNodeSetSplineResolution"); + define("GeometryNode", "GeometryNodeSimulationInput", def_geo_simulation_input); + define("GeometryNode", "GeometryNodeSimulationOutput", def_geo_simulation_output); + define("GeometryNode", "GeometryNodeSortElements"); + define("GeometryNode", "GeometryNodeSplineLength"); + define("GeometryNode", "GeometryNodeSplineParameter"); + define("GeometryNode", "GeometryNodeSplitEdges"); + define("GeometryNode", "GeometryNodeSplitToInstances"); + define("GeometryNode", "GeometryNodeStoreNamedAttribute"); + define("GeometryNode", "GeometryNodeStoreNamedGrid"); + define("GeometryNode", "GeometryNodeStringJoin"); + define("GeometryNode", "GeometryNodeStringToCurves", def_geo_string_to_curves); + define("GeometryNode", "GeometryNodeSubdivideCurve"); + define("GeometryNode", "GeometryNodeSubdivideMesh"); + define("GeometryNode", "GeometryNodeSubdivisionSurface"); + define("GeometryNode", "GeometryNodeSwitch"); + define("GeometryNode", "GeometryNodeTool3DCursor"); + define("GeometryNode", "GeometryNodeToolActiveElement"); + define("GeometryNode", "GeometryNodeToolFaceSet"); + define("GeometryNode", "GeometryNodeToolMousePosition"); + define("GeometryNode", "GeometryNodeToolSelection"); + define("GeometryNode", "GeometryNodeToolSetFaceSet"); + define("GeometryNode", "GeometryNodeToolSetSelection"); + define("GeometryNode", "GeometryNodeTransform"); + define("GeometryNode", "GeometryNodeTranslateInstances"); + define("GeometryNode", "GeometryNodeTriangulate"); + define("GeometryNode", "GeometryNodeTrimCurve"); + define("GeometryNode", "GeometryNodeUVPackIslands"); + define("GeometryNode", "GeometryNodeUVUnwrap"); + define("GeometryNode", "GeometryNodeVertexOfCorner"); + define("GeometryNode", "GeometryNodeViewer"); + define("GeometryNode", "GeometryNodeViewportTransform"); + define("GeometryNode", "GeometryNodeVolumeCube"); + define("GeometryNode", "GeometryNodeVolumeToMesh"); + define("GeometryNode", "GeometryNodeWarning"); + + /* Node group types are currently defined for each tree type individually. */ + define("ShaderNode", "ShaderNodeGroup", def_group); + define("CompositorNode", "CompositorNodeGroup", def_group); + define("TextureNode", "TextureNodeGroup", def_group); + define("GeometryNode", "GeometryNodeGroup", def_group); + + /* clang-format on */ +} + void RNA_def_nodetree(BlenderRNA *brna) { - StructRNA *srna; - rna_def_node(brna); rna_def_node_link(brna); @@ -12067,27 +12571,8 @@ void RNA_def_nodetree(BlenderRNA *brna) rna_def_geo_bake_item(brna); rna_def_geo_capture_attribute_item(brna); -# define DefNode(Category, ID, DefFunc, StructName) \ - { \ - srna = define_specific_node(brna, #Category #StructName, #Category, DefFunc); \ - if (ID == CMP_NODE_OUTPUT_FILE) { \ - /* needs brna argument, can't use NOD_static_types.h */ \ - def_cmp_output_file(brna, srna); \ - } \ - } + rna_def_nodes(brna); - /* hack, don't want to add include path to RNA just for this, since in the future RNA types - * for nodes should be defined locally at runtime anyway ... - */ -# include "../../nodes/NOD_static_types.h" - - /* Node group types need to be defined for shader, compositor, texture, geometry nodes - * individually. Cannot use the static types header for this, since they share the same int id. - */ - define_specific_node(brna, "ShaderNodeGroup", "ShaderNode", def_group); - define_specific_node(brna, "CompositorNodeGroup", "CompositorNode", def_group); - define_specific_node(brna, "TextureNodeGroup", "TextureNode", def_group); - define_specific_node(brna, "GeometryNodeGroup", "GeometryNode", def_group); def_custom_group(brna, "ShaderNodeCustomGroup", "ShaderNode",