griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Camel case for node size enum items

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/121297
This commit is contained in:
Iliya Katueshenock
2024-05-01 15:27:34 +02:00
committed by Hans Goudey
parent a42e2a5a29
commit 5fa98aa0fd
46 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/BKE_node.hh
View File

@@ -1629,10 +1629,10 @@ void node_type_socket_templates(bNodeType *ntype,
void node_type_size(bNodeType *ntype, int width, int minwidth, int maxwidth);
enum class eNodeSizePreset : int8_t {
DEFAULT,
SMALL,
MIDDLE,
LARGE,
Default,
Small,
Middle,
Large,
};
void node_type_size_preset(bNodeType *ntype, eNodeSizePreset size);

10
source/blender/blenkernel/intern/node.cc
View File

@@ -4287,7 +4287,7 @@ const char *nodeSocketLabel(const bNodeSocket *sock)
static void node_type_base_defaults(bNodeType *ntype)
{
/* default size values */
blender::bke::node_type_size_preset(ntype, blender::bke::eNodeSizePreset::DEFAULT);
blender::bke::node_type_size_preset(ntype, blender::bke::eNodeSizePreset::Default);
ntype->height = 100;
ntype->minheight = 30;
ntype->maxheight = FLT_MAX;
@@ -4604,16 +4604,16 @@ void node_type_size(bNodeType *ntype, const int width, const int minwidth, const
void node_type_size_preset(bNodeType *ntype, const eNodeSizePreset size)
{
switch (size) {
case eNodeSizePreset::DEFAULT:
case eNodeSizePreset::Default:
node_type_size(ntype, 140, 100, NODE_DEFAULT_MAX_WIDTH);
break;
case eNodeSizePreset::SMALL:
case eNodeSizePreset::Small:
node_type_size(ntype, 100, 80, NODE_DEFAULT_MAX_WIDTH);
break;
case eNodeSizePreset::MIDDLE:
case eNodeSizePreset::Middle:
node_type_size(ntype, 150, 120, NODE_DEFAULT_MAX_WIDTH);
break;
case eNodeSizePreset::LARGE:
case eNodeSizePreset::Large:
node_type_size(ntype, 240, 140, NODE_DEFAULT_MAX_WIDTH);
break;
}

2
source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc
View File

@@ -159,7 +159,7 @@ void register_node_type_cmp_convert_color_space()
&ntype, CMP_NODE_CONVERT_COLOR_SPACE, "Convert Colorspace", NODE_CLASS_CONVERTER);
ntype.declare = file_ns::CMP_NODE_CONVERT_COLOR_SPACE_declare;
ntype.draw_buttons = file_ns::node_composit_buts_convert_colorspace;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_composit_init_convert_colorspace;
node_type_storage(
&ntype, "NodeConvertColorSpace", node_free_standard_storage, node_copy_standard_storage);

2
source/blender/nodes/composite/nodes/node_composite_image.cc
View File

@@ -805,7 +805,7 @@ void register_node_type_cmp_rlayers()
&ntype, nullptr, file_ns::node_composit_free_rlayers, file_ns::node_composit_copy_rlayers);
ntype.updatefunc = file_ns::cmp_node_rlayers_update;
ntype.initfunc = node_cmp_rlayers_outputs;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
nodeRegisterType(&ntype);
}

2
source/blender/nodes/composite/nodes/node_composite_rgb.cc
View File

@@ -56,7 +56,7 @@ void register_node_type_cmp_rgb()
cmp_node_type_base(&ntype, CMP_NODE_RGB, "RGB", NODE_CLASS_INPUT);
ntype.declare = file_ns::cmp_node_rgb_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::DEFAULT);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Default);
ntype.get_compositor_operation = file_ns::get_compositor_operation;
nodeRegisterType(&ntype);

2
source/blender/nodes/composite/nodes/node_composite_switch.cc
View File

@@ -64,7 +64,7 @@ void register_node_type_cmp_switch()
cmp_node_type_base(&ntype, CMP_NODE_SWITCH, "Switch", NODE_CLASS_LAYOUT);
ntype.declare = file_ns::cmp_node_switch_declare;
ntype.draw_buttons = file_ns::node_composit_buts_switch;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::DEFAULT);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Default);
ntype.get_compositor_operation = file_ns::get_compositor_operation;
nodeRegisterType(&ntype);

2
source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
View File

@@ -194,7 +194,7 @@ void register_node_type_cmp_rgbtobw()
cmp_node_type_base(&ntype, CMP_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTER);
ntype.declare = file_ns::cmp_node_rgbtobw_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::DEFAULT);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Default);
ntype.get_compositor_shader_node = file_ns::get_compositor_shader_node;
nodeRegisterType(&ntype);

2
source/blender/nodes/composite/nodes/node_composite_value.cc
View File

@@ -52,7 +52,7 @@ void register_node_type_cmp_value()
cmp_node_type_base(&ntype, CMP_NODE_VALUE, "Value", NODE_CLASS_INPUT);
ntype.declare = file_ns::cmp_node_value_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::DEFAULT);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Default);
ntype.get_compositor_operation = file_ns::get_compositor_operation;
nodeRegisterType(&ntype);

2
source/blender/nodes/geometry/nodes/node_geo_image.cc
View File

@@ -43,7 +43,7 @@ static void node_register()
ntype.geometry_node_execute = node_geo_exec;
ntype.draw_buttons = node_layout;
ntype.declare = node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
nodeRegisterType(&ntype);
}
NOD_REGISTER_NODE(node_register)

2
source/blender/nodes/geometry/nodes/node_geo_image_info.cc
View File

@@ -82,7 +82,7 @@ static void node_register()
geo_node_type_base(&ntype, GEO_NODE_IMAGE_INFO, "Image Info", NODE_CLASS_INPUT);
ntype.declare = node_declare;
ntype.geometry_node_execute = node_geo_exec;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
nodeRegisterType(&ntype);
}
NOD_REGISTER_NODE(node_register)

2
source/blender/nodes/geometry/nodes/node_geo_image_texture.cc
View File

@@ -425,7 +425,7 @@ static void node_register()
ntype.initfunc = node_init;
node_type_storage(
&ntype, "NodeGeometryImageTexture", node_free_standard_storage, node_copy_standard_storage);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.geometry_node_execute = node_geo_exec;
nodeRegisterType(&ntype);

2
source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc
View File

@@ -113,7 +113,7 @@ static void node_register()
static bNodeType ntype;
geo_node_type_base(
&ntype, GEO_NODE_INPUT_CURVE_HANDLES, "Curve Handle Positions", NODE_CLASS_INPUT);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.geometry_node_execute = node_geo_exec;
ntype.declare = node_declare;
nodeRegisterType(&ntype);

2
source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc
View File

@@ -156,7 +156,7 @@ static void node_register()
static bNodeType ntype;
geo_node_type_base(
&ntype, GEO_NODE_INPUT_MESH_FACE_NEIGHBORS, "Face Neighbors", NODE_CLASS_INPUT);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.declare = node_declare;
ntype.geometry_node_execute = node_geo_exec;
nodeRegisterType(&ntype);

2
source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc
View File

@@ -127,7 +127,7 @@ static void node_register()
static bNodeType ntype;
geo_node_type_base(
&ntype, GEO_NODE_MESH_FACE_GROUP_BOUNDARIES, "Face Group Boundaries", NODE_CLASS_INPUT);
bke::node_type_size_preset(&ntype, bke::eNodeSizePreset::MIDDLE);
bke::node_type_size_preset(&ntype, bke::eNodeSizePreset::Middle);
ntype.declare = node_declare;
ntype.geometry_node_execute = node_geo_exec;
nodeRegisterType(&ntype);

2
source/blender/nodes/geometry/nodes/node_geo_raycast.cc
View File

@@ -308,7 +308,7 @@ static void node_register()
static bNodeType ntype;
geo_node_type_base(&ntype, GEO_NODE_RAYCAST, "Raycast", NODE_CLASS_GEOMETRY);
bke::node_type_size_preset(&ntype, bke::eNodeSizePreset::MIDDLE);
bke::node_type_size_preset(&ntype, bke::eNodeSizePreset::Middle);
ntype.initfunc = node_init;
node_type_storage(
&ntype, "NodeGeometryRaycast", node_free_standard_storage, node_copy_standard_storage);

2
source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
View File

@@ -240,7 +240,7 @@ static void node_register()
&ntype, GEO_NODE_SAMPLE_NEAREST_SURFACE, "Sample Nearest Surface", NODE_CLASS_GEOMETRY);
ntype.initfunc = node_init;
ntype.declare = node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.geometry_node_execute = node_geo_exec;
ntype.draw_buttons = node_layout;
ntype.gather_link_search_ops = node_gather_link_searches;

2
source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
View File

@@ -230,7 +230,7 @@ static void node_register()
ntype.geometry_node_execute = node_geo_exec;
ntype.draw_buttons = node_layout;
ntype.initfunc = node_init;
bke::node_type_size_preset(&ntype, bke::eNodeSizePreset::MIDDLE);
bke::node_type_size_preset(&ntype, bke::eNodeSizePreset::Middle);
node_type_storage(&ntype,
"NodeGeometrySubdivisionSurface",
node_free_standard_storage,

2
source/blender/nodes/shader/nodes/node_shader_blackbody.cc
View File

@@ -68,7 +68,7 @@ void register_node_type_sh_blackbody()
sh_fn_node_type_base(&ntype, SH_NODE_BLACKBODY, "Blackbody", NODE_CLASS_CONVERTER);
ntype.declare = file_ns::node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.gpu_fn = file_ns::node_shader_gpu_blackbody;
ntype.build_multi_function = file_ns::sh_node_blackbody_build_multi_function;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc
View File

@@ -64,7 +64,7 @@ void register_node_type_sh_bsdf_diffuse()
sh_node_type_base(&ntype, SH_NODE_BSDF_DIFFUSE, "Diffuse BSDF", NODE_CLASS_SHADER);
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_shader_nodes_poll;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_diffuse;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc
View File

@@ -77,7 +77,7 @@ void register_node_type_sh_bsdf_glass()
sh_node_type_base(&ntype, SH_NODE_BSDF_GLASS, "Glass BSDF", NODE_CLASS_SHADER);
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_shader_nodes_poll;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_glass;
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_glass;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc
View File

@@ -99,7 +99,7 @@ void register_node_type_sh_bsdf_glossy()
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_shader_nodes_poll;
ntype.draw_buttons = file_ns::node_shader_buts_glossy;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_glossy;
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_glossy;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc
View File

@@ -217,7 +217,7 @@ void register_node_type_sh_bsdf_hair_principled()
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_cycles_shader_nodes_poll;
ntype.draw_buttons = file_ns::node_shader_buts_principled_hair;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.initfunc = file_ns::node_shader_init_hair_principled;
ntype.updatefunc = file_ns::node_shader_update_hair_principled;
ntype.gpu_fn = file_ns::node_shader_gpu_hair_principled;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
View File

@@ -657,7 +657,7 @@ void register_node_type_sh_bsdf_principled()
sh_node_type_base(&ntype, SH_NODE_BSDF_PRINCIPLED, "Principled BSDF", NODE_CLASS_SHADER);
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_shader_nodes_poll;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.initfunc = file_ns::node_shader_init_principled;
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_principled;
ntype.updatefunc = file_ns::node_shader_update_principled;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc
View File

@@ -75,7 +75,7 @@ void register_node_type_sh_bsdf_refraction()
sh_node_type_base(&ntype, SH_NODE_BSDF_REFRACTION, "Refraction BSDF", NODE_CLASS_SHADER);
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_shader_nodes_poll;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_refraction;
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_refraction;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc
View File

@@ -52,7 +52,7 @@ void register_node_type_sh_bsdf_toon()
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_cycles_shader_nodes_poll;
ntype.draw_buttons = file_ns::node_shader_buts_toon;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_toon;
nodeRegisterType(&ntype);

2
source/blender/nodes/shader/nodes/node_shader_color_ramp.cc
View File

@@ -162,7 +162,7 @@ void register_node_type_sh_valtorgb()
sh_fn_node_type_base(&ntype, SH_NODE_VALTORGB, "Color Ramp", NODE_CLASS_CONVERTER);
ntype.declare = file_ns::sh_node_valtorgb_declare;
ntype.initfunc = file_ns::node_shader_init_valtorgb;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
node_type_storage(&ntype, "ColorBand", node_free_standard_storage, node_copy_standard_storage);
ntype.gpu_fn = file_ns::gpu_shader_valtorgb;
ntype.build_multi_function = file_ns::sh_node_valtorgb_build_multi_function;

6
source/blender/nodes/shader/nodes/node_shader_curves.cc
View File

@@ -135,7 +135,7 @@ void register_node_type_sh_curve_vec()
sh_fn_node_type_base(&ntype, SH_NODE_CURVE_VEC, "Vector Curves", NODE_CLASS_OP_VECTOR);
ntype.declare = file_ns::sh_node_curve_vec_declare;
ntype.initfunc = file_ns::node_shader_init_curve_vec;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
ntype.gpu_fn = file_ns::gpu_shader_curve_vec;
ntype.build_multi_function = file_ns::sh_node_curve_vec_build_multi_function;
@@ -295,7 +295,7 @@ void register_node_type_sh_curve_rgb()
sh_fn_node_type_base(&ntype, SH_NODE_CURVE_RGB, "RGB Curves", NODE_CLASS_OP_COLOR);
ntype.declare = file_ns::sh_node_curve_rgb_declare;
ntype.initfunc = file_ns::node_shader_init_curve_rgb;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
ntype.gpu_fn = file_ns::gpu_shader_curve_rgb;
ntype.build_multi_function = file_ns::sh_node_curve_rgb_build_multi_function;
@@ -423,7 +423,7 @@ void register_node_type_sh_curve_float()
sh_fn_node_type_base(&ntype, SH_NODE_CURVE_FLOAT, "Float Curve", NODE_CLASS_CONVERTER);
ntype.declare = file_ns::sh_node_curve_float_declare;
ntype.initfunc = file_ns::node_shader_init_curve_float;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
ntype.gpu_fn = file_ns::gpu_shader_curve_float;
ntype.build_multi_function = file_ns::sh_node_curve_float_build_multi_function;

2
source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc
View File

@@ -83,7 +83,7 @@ void register_node_type_sh_hue_sat()
sh_node_type_base(&ntype, SH_NODE_HUE_SAT, "Hue/Saturation/Value", NODE_CLASS_OP_COLOR);
ntype.declare = file_ns::node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.gpu_fn = file_ns::gpu_shader_hue_sat;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_light_falloff.cc
View File

@@ -56,7 +56,7 @@ void register_node_type_sh_light_falloff()
sh_node_type_base(&ntype, SH_NODE_LIGHT_FALLOFF, "Light Falloff", NODE_CLASS_OP_COLOR);
ntype.declare = file_ns::node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.gpu_fn = file_ns::node_shader_gpu_light_falloff;
ntype.materialx_fn = file_ns::node_shader_materialx;

2
source/blender/nodes/shader/nodes/node_shader_normal_map.cc
View File

@@ -172,7 +172,7 @@ void register_node_type_sh_normal_map()
sh_node_type_base(&ntype, SH_NODE_NORMAL_MAP, "Normal Map", NODE_CLASS_OP_VECTOR);
ntype.declare = file_ns::node_declare;
ntype.draw_buttons = file_ns::node_shader_buts_normal_map;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_normal_map;
node_type_storage(
&ntype, "NodeShaderNormalMap", node_free_standard_storage, node_copy_standard_storage);

2
source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc
View File

@@ -120,7 +120,7 @@ void register_node_type_sh_subsurface_scattering()
ntype.declare = file_ns::node_declare;
ntype.add_ui_poll = object_shader_nodes_poll;
ntype.draw_buttons = file_ns::node_shader_buts_subsurface;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_subsurface_scattering;
ntype.gpu_fn = file_ns::node_shader_gpu_subsurface_scattering;
ntype.updatefunc = file_ns::node_shader_update_subsurface_scattering;

2
source/blender/nodes/shader/nodes/node_shader_tangent.cc
View File

@@ -102,7 +102,7 @@ void register_node_type_sh_tangent()
sh_node_type_base(&ntype, SH_NODE_TANGENT, "Tangent", NODE_CLASS_INPUT);
ntype.declare = file_ns::node_declare;
ntype.draw_buttons = file_ns::node_shader_buts_tangent;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_tangent;
ntype.gpu_fn = file_ns::node_shader_gpu_tangent;
node_type_storage(

2
source/blender/nodes/shader/nodes/node_shader_tex_brick.cc
View File

@@ -283,7 +283,7 @@ void register_node_type_sh_tex_brick()
sh_fn_node_type_base(&ntype, SH_NODE_TEX_BRICK, "Brick Texture", NODE_CLASS_TEXTURE);
ntype.declare = file_ns::sh_node_tex_brick_declare;
ntype.draw_buttons = file_ns::node_shader_buts_tex_brick;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_tex_brick;
node_type_storage(
&ntype, "NodeTexBrick", node_free_standard_storage, node_copy_standard_storage);

2
source/blender/nodes/shader/nodes/node_shader_tex_environment.cc
View File

@@ -196,7 +196,7 @@ void register_node_type_sh_tex_environment()
&ntype, "NodeTexEnvironment", node_free_standard_storage, node_copy_standard_storage);
ntype.gpu_fn = file_ns::node_shader_gpu_tex_environment;
ntype.labelfunc = node_image_label;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.materialx_fn = file_ns::node_shader_materialx;
nodeRegisterType(&ntype);

2
source/blender/nodes/shader/nodes/node_shader_tex_image.cc
View File

@@ -269,7 +269,7 @@ void register_node_type_sh_tex_image()
&ntype, "NodeTexImage", node_free_standard_storage, node_copy_standard_storage);
ntype.gpu_fn = file_ns::node_shader_gpu_tex_image;
ntype.labelfunc = node_image_label;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.materialx_fn = file_ns::node_shader_materialx;
nodeRegisterType(&ntype);

2
source/blender/nodes/shader/nodes/node_shader_tex_sky.cc
View File

@@ -315,7 +315,7 @@ void register_node_type_sh_tex_sky()
sh_node_type_base(&ntype, SH_NODE_TEX_SKY, "Sky Texture", NODE_CLASS_TEXTURE);
ntype.declare = file_ns::node_declare;
ntype.draw_buttons = file_ns::node_shader_buts_tex_sky;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_tex_sky;
node_type_storage(&ntype, "NodeTexSky", node_free_standard_storage, node_copy_standard_storage);
ntype.gpu_fn = file_ns::node_shader_gpu_tex_sky;

2
source/blender/nodes/shader/nodes/node_shader_tex_wave.cc
View File

@@ -321,7 +321,7 @@ void register_node_type_sh_tex_wave()
sh_fn_node_type_base(&ntype, SH_NODE_TEX_WAVE, "Wave Texture", NODE_CLASS_TEXTURE);
ntype.declare = file_ns::sh_node_tex_wave_declare;
ntype.draw_buttons = file_ns::node_shader_buts_tex_wave;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_tex_wave;
node_type_storage(&ntype, "NodeTexWave", node_free_standard_storage, node_copy_standard_storage);
ntype.gpu_fn = file_ns::node_shader_gpu_tex_wave;

2
source/blender/nodes/shader/nodes/node_shader_uvmap.cc
View File

@@ -91,7 +91,7 @@ void register_node_type_sh_uvmap()
sh_node_type_base(&ntype, SH_NODE_UVMAP, "UV Map", NODE_CLASS_INPUT);
ntype.declare = file_ns::node_declare;
ntype.draw_buttons = file_ns::node_shader_buts_uvmap;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = file_ns::node_shader_init_uvmap;
node_type_storage(
&ntype, "NodeShaderUVMap", node_free_standard_storage, node_copy_standard_storage);

2
source/blender/nodes/shader/nodes/node_shader_volume_principled.cc
View File

@@ -162,7 +162,7 @@ void register_node_type_sh_volume_principled()
sh_node_type_base(&ntype, SH_NODE_VOLUME_PRINCIPLED, "Principled Volume", NODE_CLASS_SHADER);
ntype.declare = file_ns::node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.gpu_fn = file_ns::node_shader_gpu_volume_principled;
nodeRegisterType(&ntype);

2
source/blender/nodes/shader/nodes/node_shader_wavelength.cc
View File

@@ -45,7 +45,7 @@ void register_node_type_sh_wavelength()
sh_node_type_base(&ntype, SH_NODE_WAVELENGTH, "Wavelength", NODE_CLASS_CONVERTER);
ntype.declare = file_ns::node_declare;
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.gpu_fn = file_ns::node_shader_gpu_wavelength;
nodeRegisterType(&ntype);

2
source/blender/nodes/texture/nodes/node_texture_bricks.cc
View File

@@ -109,7 +109,7 @@ void register_node_type_tex_bricks()
tex_node_type_base(&ntype, TEX_NODE_BRICKS, "Bricks", NODE_CLASS_PATTERN);
blender::bke::node_type_socket_templates(&ntype, inputs, outputs);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = init;
ntype.exec_fn = exec;
ntype.flag |= NODE_PREVIEW;

4
source/blender/nodes/texture/nodes/node_texture_curves.cc
View File

@@ -56,7 +56,7 @@ void register_node_type_tex_curve_time()
tex_node_type_base(&ntype, TEX_NODE_CURVE_TIME, "Time", NODE_CLASS_INPUT);
blender::bke::node_type_socket_templates(&ntype, nullptr, time_outputs);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.initfunc = time_init;
node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
ntype.init_exec_fn = node_initexec_curves;
@@ -106,7 +106,7 @@ void register_node_type_tex_curve_rgb()
tex_node_type_base(&ntype, TEX_NODE_CURVE_RGB, "RGB Curves", NODE_CLASS_OP_COLOR);
blender::bke::node_type_socket_templates(&ntype, rgb_inputs, rgb_outputs);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.initfunc = rgb_init;
node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
ntype.init_exec_fn = node_initexec_curves;

2
source/blender/nodes/texture/nodes/node_texture_hueSatVal.cc
View File

@@ -95,7 +95,7 @@ void register_node_type_tex_hue_sat()
tex_node_type_base(&ntype, TEX_NODE_HUE_SAT, "Hue/Saturation/Value", NODE_CLASS_OP_COLOR);
blender::bke::node_type_socket_templates(&ntype, inputs, outputs);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.exec_fn = exec;
nodeRegisterType(&ntype);

2
source/blender/nodes/texture/nodes/node_texture_output.cc
View File

@@ -140,7 +140,7 @@ void register_node_type_tex_output()
tex_node_type_base(&ntype, TEX_NODE_OUTPUT, "Output", NODE_CLASS_OUTPUT);
blender::bke::node_type_socket_templates(&ntype, inputs, nullptr);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle);
ntype.initfunc = init;
node_type_storage(&ntype, "TexNodeOutput", node_free_standard_storage, copy);
ntype.exec_fn = exec;

2
source/blender/nodes/texture/nodes/node_texture_proc.cc
View File

@@ -257,7 +257,7 @@ static void init(bNodeTree * /*ntree*/, bNode *node)
\
tex_node_type_base(&ntype, TEX_NODE_PROC + TEXTYPE, Name, NODE_CLASS_TEXTURE); \
blender::bke::node_type_socket_templates(&ntype, name##_inputs, outputs); \
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE); \
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Middle); \
ntype.initfunc = init; \
node_type_storage(&ntype, "Tex", node_free_standard_storage, node_copy_standard_storage); \
ntype.exec_fn = name##_exec; \

2
source/blender/nodes/texture/nodes/node_texture_valToRgb.cc
View File

@@ -51,7 +51,7 @@ void register_node_type_tex_valtorgb()
tex_node_type_base(&ntype, TEX_NODE_VALTORGB, "Color Ramp", NODE_CLASS_CONVERTER);
blender::bke::node_type_socket_templates(&ntype, valtorgb_in, valtorgb_out);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::LARGE);
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::Large);
ntype.initfunc = valtorgb_init;
node_type_storage(&ntype, "ColorBand", node_free_standard_storage, node_copy_standard_storage);
ntype.exec_fn = valtorgb_exec;