Commit: d3ad04172de2b928aeb561b74a58996586b1db1c Author: Aaron Carlisle Date: Mon Jan 3 19:32:33 2022 -0500 Branches: master https://developer.blender.org/rBd3ad04172de2b928aeb561b74a58996586b1db1c
Cleanup: Remove bNodeType flag from base registration functions This flag is only used a few small cases, so instead of setting the flag for every node only set the required flag for the nodes that require it. Mostly the flag is used to set `ntype.flag = NODE_PREVIEW` For nodes that should have previews by default which is only some compositor nodes and some texture nodes. The frame node also sets the `NODE_BACKGROUND` flag. All other nodes were setting a flag of 0 which has no purpose. Reviewed By: JacquesLucke Differential Revision: https://developer.blender.org/D13699 =================================================================== M source/blender/blenkernel/BKE_node.h M source/blender/blenkernel/intern/node.cc M source/blender/makesrna/intern/rna_nodetree.c M source/blender/nodes/composite/node_composite_util.cc M source/blender/nodes/composite/node_composite_util.hh M source/blender/nodes/composite/nodes/node_composite_alphaOver.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_channelMatte.cc M source/blender/nodes/composite/nodes/node_composite_chromaMatte.cc M source/blender/nodes/composite/nodes/node_composite_colorMatte.cc M source/blender/nodes/composite/nodes/node_composite_colorSpill.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_composite.cc M source/blender/nodes/composite/nodes/node_composite_cornerpin.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_diffMatte.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_displace.cc M source/blender/nodes/composite/nodes/node_composite_distanceMatte.cc M source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.cc M source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc M source/blender/nodes/composite/nodes/node_composite_exposure.cc M source/blender/nodes/composite/nodes/node_composite_filter.cc M source/blender/nodes/composite/nodes/node_composite_flip.cc M source/blender/nodes/composite/nodes/node_composite_gamma.cc M source/blender/nodes/composite/nodes/node_composite_glare.cc M source/blender/nodes/composite/nodes/node_composite_hueSatVal.cc M source/blender/nodes/composite/nodes/node_composite_huecorrect.cc M source/blender/nodes/composite/nodes/node_composite_idMask.cc M source/blender/nodes/composite/nodes/node_composite_image.cc M source/blender/nodes/composite/nodes/node_composite_inpaint.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_keyingscreen.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_lummaMatte.cc M source/blender/nodes/composite/nodes/node_composite_mapRange.cc M source/blender/nodes/composite/nodes/node_composite_mapUV.cc M source/blender/nodes/composite/nodes/node_composite_mapValue.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_mixrgb.cc M source/blender/nodes/composite/nodes/node_composite_movieclip.cc M source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc M source/blender/nodes/composite/nodes/node_composite_normal.cc M source/blender/nodes/composite/nodes/node_composite_normalize.cc M source/blender/nodes/composite/nodes/node_composite_outputFile.cc M source/blender/nodes/composite/nodes/node_composite_pixelate.cc M source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc M source/blender/nodes/composite/nodes/node_composite_posterize.cc M source/blender/nodes/composite/nodes/node_composite_premulkey.cc M source/blender/nodes/composite/nodes/node_composite_rgb.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_sepcombHSVA.cc M source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.cc M source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc M source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.cc M source/blender/nodes/composite/nodes/node_composite_setalpha.cc M source/blender/nodes/composite/nodes/node_composite_splitViewer.cc M source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc M source/blender/nodes/composite/nodes/node_composite_sunbeams.cc M source/blender/nodes/composite/nodes/node_composite_switch.cc M source/blender/nodes/composite/nodes/node_composite_switchview.cc M source/blender/nodes/composite/nodes/node_composite_texture.cc M source/blender/nodes/composite/nodes/node_composite_tonemap.cc M source/blender/nodes/composite/nodes/node_composite_trackpos.cc M source/blender/nodes/composite/nodes/node_composite_transform.cc M source/blender/nodes/composite/nodes/node_composite_translate.cc M source/blender/nodes/composite/nodes/node_composite_valToRgb.cc M source/blender/nodes/composite/nodes/node_composite_value.cc M source/blender/nodes/composite/nodes/node_composite_vecBlur.cc M source/blender/nodes/composite/nodes/node_composite_viewer.cc M source/blender/nodes/composite/nodes/node_composite_zcombine.cc M source/blender/nodes/function/node_function_util.cc M source/blender/nodes/function/node_function_util.hh M source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc M source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc M source/blender/nodes/function/nodes/node_fn_boolean_math.cc M source/blender/nodes/function/nodes/node_fn_compare.cc M source/blender/nodes/function/nodes/node_fn_float_to_int.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_special_characters.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_replace_string.cc M source/blender/nodes/function/nodes/node_fn_rotate_euler.cc M source/blender/nodes/function/nodes/node_fn_slice_string.cc M source/blender/nodes/function/nodes/node_fn_string_length.cc M source/blender/nodes/function/nodes/node_fn_value_to_string.cc M source/blender/nodes/geometry/node_geometry_util.cc M source/blender/nodes/geometry/node_geometry_util.hh M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_align_rotation_to_vector.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_clamp.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_color_ramp.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_combine_xyz.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_compare.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_convert.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_curve_map.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_fill.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_map_range.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_math.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_mix.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_proximity.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_randomize.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_sample_texture.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_separate_xyz.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_transfer.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_vector_math.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_vector_rotate.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_endpoints.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_select_by_handle_type.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_to_points.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_edge_split.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_material_assign.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_mesh_to_curve.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_distribute.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_instance.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_rotate.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_scale.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_separate.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_translate.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_points_to_volume.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_raycast.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_select_by_material.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_subdivision_surface.cc M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_volume_to_mesh.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_remove.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_bounding_box.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_convex_hull.cc M source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.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_length.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_quadratic_bezier.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_spiral.cc M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_star.cc M source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc M source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc M source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc M source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc M source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc M source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc M source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc M source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.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_on_faces.cc M source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc M source/blender/nodes/geometry/nodes/node_geo_edge_split.cc M source/blender/nodes/geometry/nodes/node_geo_geometry_to_instance.cc M source/blender/nodes/geometry/nodes/node_geo_image_texture.cc M source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc M source/blender/nodes/geometry/nodes/node_geo_input_curve_tilt.cc M source/blender/nodes/geometry/nodes/node_geo_input_id.cc M source/blender/nodes/geometry/nodes/node_geo_input_index.cc M source/blender/nodes/geometry/nodes/node_geo_input_material.cc M source/blender/nodes/geometry/nodes/node_geo_input_material_index.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc M source/blender/nodes/geometry/nodes/node_geo_input_normal.cc M source/blender/nodes/geometry/nodes/node_geo_input_position.cc M source/blender/nodes/geometry/nodes/node_geo_input_radius.cc M source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc M source/blender/nodes/geometry/nodes/node_geo_input_shade_smooth.cc M source/blender/nodes/geometry/nodes/node_geo_input_spline_cyclic.cc M source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc M source/blender/nodes/geometry/nodes/node_geo_input_spline_resolution.cc M source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc M source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc M source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc M source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc M source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc M source/blender/nodes/geometry/nodes/node_geo_material_replace.cc M source/blender/nodes/geometry/nodes/node_geo_material_selection.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_cube.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc M source/blender/nodes/geometry/nodes/node_geo_object_info.cc M source/blender/nodes/geometry/nodes/node_geo_points_to_vertices.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_realize_instances.cc M source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc M source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc M source/blender/nodes/geometry/nodes/node_geo_separate_components.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_radius.cc M source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc M source/blender/nodes/geometry/nodes/node_geo_set_id.cc M source/blender/nodes/geometry/nodes/node_geo_set_material.cc M source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc M source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc M source/blender/nodes/geometry/nodes/node_geo_set_position.cc M source/blender/nodes/geometry/nodes/node_geo_set_shade_smooth.cc M source/blender/nodes/geometry/nodes/node_geo_set_spline_cyclic.cc M source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc M source/blender/nodes/geometry/nodes/node_geo_string_join.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_transfer_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_transform.cc M source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc M source/blender/nodes/geometry/nodes/node_geo_triangulate.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/node_shader_util.cc M source/blender/nodes/shader/node_shader_util.h 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.c 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_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_linestyle.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_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_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_uv_along_stroke.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/node_texture_util.c M source/blender/nodes/texture/node_texture_util.h 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_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_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 88c5fbeb60f..56b44994985 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -969,9 +969,11 @@ bool nodeGroupPoll(struct bNodeTree *nodetree, /** * Initialize a new node type struct with default values and callbacks. */ -void node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag); -void node_type_base_custom( - struct bNodeType *ntype, const char *idname, const char *name, short nclass, short flag); +void node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass); +void node_type_base_custom(struct bNodeType *ntype, + const char *idname, + const char *name, + short nclass); void node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTemplate *inputs, struct bNodeSocketTemplate *outputs); diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index b6f69f9a9f7..f32db41f62d 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -4357,8 +4357,7 @@ static bool node_poll_instance_default(bNode *node, bNodeTree *ntree, const char return node->typeinfo->poll(node->typeinfo, ntree, disabled_hint); } -/* NOLINTNEXTLINE: readability-function-size */ -void node_type_base(bNodeType *ntype, int type, const char *name, short nclass, short flag) +void node_type_base(bNodeType *ntype, int type, const char *name, short nclass) { /* Use static type info header to map static int type to identifier string and RNA struct type. * Associate the RNA struct type with the bNodeType. @@ -4385,7 +4384,6 @@ void node_type_base(bNodeType *ntype, int type, const char *name, short nclass, ntype->type = type; BLI_strncpy(ntype->ui_name, name, sizeof(ntype->ui_name)); ntype->nclass = nclass; - ntype->flag = flag; node_type_base_defaults(ntype); @@ -4393,14 +4391,12 @@ void node_type_base(bNodeType *ntype, int type, const char *name, short nclass, ntype->poll_instance = node_poll_instance_default; } -void node_type_base_custom( - bNodeType *ntype, const char *idname, const char *name, short nclass, short flag) +void node_type_base_custom(bNodeType *ntype, const char *idname, const char *name, short nclass) { BLI_strncpy(ntype->idname, idname, sizeof(ntype->idname)); ntype->type = NODE_CUSTOM; BLI_strncpy(ntype->ui_name, name, sizeof(ntype->ui_name)); ntype->nclass = nclass; - ntype->flag = flag; node_type_base_defaults(ntype); } @@ -4576,7 +4572,7 @@ static void register_undefined_types() strcpy(NodeTreeTypeUndefined.ui_name, N_("Undefined")); strcpy(NodeTreeTypeUndefined.ui_description, N_("Undefined Node Tree Type")); - node_type_base_custom(&NodeTypeUndefined, "NodeUndefined", "Undefined", 0, 0); + node_type_base_custom(&NodeTypeUndefined, "NodeUndefined", "Undefined", 0); NodeTypeUndefined.poll = node_undefined_poll; BLI_strncpy(NodeSocketTypeUndefined.idname, diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index f6751117d55..98de40ead93 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1953,7 +1953,7 @@ static bNodeType *rna_Node_register_base(Main *bmain, /* setup dummy node & node type to store static properties in */ memset(&dummynt, 0, sizeof(bNodeType)); /* this does some additional initialization of default values */ - node_type_base_custom(&dummynt, identifier, "", 0, 0); + node_type_base_custom(&dummynt, identifier, "", 0); memset(&dummynode, 0, sizeof(bNode)); dummynode.typeinfo = &dummynt; diff --git a/source/blender/nodes/composite/node_composite_util.cc b/source/blender/nodes/composite/node_composite_util.cc index 1262dfad11f..1f892c1c9e2 100644 --- a/source/blender/nodes/composite/node_composite_util.cc +++ b/source/blender/nodes/composite/node_composite_util.cc @@ -47,9 +47,9 @@ void cmp_node_update_default(bNodeTree *UNUSED(ntree), bNode *node) node->need_exec = 1; } -void cmp_node_type_base(bNodeType *ntype, int type, const char *name, short nclass, short flag) +void cmp_node_type_base(bNodeType *ntype, int type, const char *name, short nclass) { - node_type_base(ntype, type, name, nclass, flag); + node_type_base(ntype, type, name, nclass); ntype->poll = cmp_node_poll_default; ntype->updatefunc = cmp_node_update_default; diff --git a/source/blender/nodes/composite/node_composite_util.hh b/source/blender/nodes/composite/node_composite_util.hh index 04708d0d854..65dbc2065ef 100644 --- a/source/blender/nodes/composite/node_composite_util.hh +++ b/source/blender/nodes/composite/node_composite_util.hh @@ -52,5 +52,4 @@ bool cmp_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree, const char **r_disabled_hint); void cmp_node_update_default(struct bNodeTree *ntree, struct bNode *node); -void cmp_node_type_base( - struct bNodeType *ntype, int type, const char *name, short nclass, short flag); +void cmp_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass); diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc b/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc index f02842b2c66..82ef5df8403 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc @@ -58,7 +58,7 @@ void register_node_type_cmp_alphaover() { static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR, 0); + cmp_node_type_base(&ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR); ntype.declare = blender::nodes::cmp_node_alphaover_declare; ntype.draw_buttons = node_composit_buts_alphaover; node_type_init(&ntype, node_alphaover_init); diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc index 55bfbadf5b2..b42b219ced9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc +++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc @@ -66,10 +66,10 @@ void register_node_type_cmp_antialiasing() { static bNodeType ntype; - cmp_node_type_base( - &ntype, CMP_NODE_ANTIALIASING, "Anti-Aliasing", NODE_CLASS_OP_FILTER, NODE_PREVIEW); + cmp_node_type_base(&ntype, CMP_NODE_ANTIALIASING, "Anti-Aliasing", NODE_CLASS_OP_FILTER); ntype.declare = blender::nodes::cmp_node_antialiasing_declare; ntype.draw_buttons = node_composit_buts_antialiasing; + ntype.flag |= NODE_PREVIEW; node_type_size(&ntype, 170, 140, 200); node_type_init(&ntype, node_composit_init_antialiasing); node_type_storage( diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index 9c133e1a00c..2b4030935a0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -64,7 +64,7 @@ void register_node_type_cmp_bilateralblur() { static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER, 0); + cmp_node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER); ntype.declare = blender::nodes::cmp_node_bilateralblur_declare; ntype.draw_buttons = node_composit_buts_bilateralblur; node_type_init(&ntype, node_composit_init_bilateralblur); diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 16eac697da1..b7904ffdafe 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -94,9 +94,10 @@ void register_node_type_cmp_blur() { static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW); + cmp_node_type_base(&ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER); ntype.declare = blender::nodes::cmp_node_blur_declare; ntype.draw_buttons = node_composit_buts_blur; + ntype.flag |= NODE_PREVIEW; node_type_init(&ntype, node_composit_init_blur); node_type_storage( &ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage); diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index d0659f6a51e..2ecdedf5da1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -60,7 +60,7 @@ void register_node_type_cmp_bokehblur() { static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER, 0); + cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER); ntype.declare = blender::nodes::cmp_node_bokehblur_declare; ntype.draw_buttons = node_composit_buts_bokehblur; node_type_init(&ntype, node_composit_init_bokehblur); diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index 43ce6d485c5..005638ad5df 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -67,9 +67,10 @@ void register_node_type_cmp_bokehimage() { static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW); + cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT); ntype.declare = blender::nodes::cmp_node_bokehimage_declare; ntype.draw_buttons = node_composit_b @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
