diff --git a/intern/cycles/kernel/camera/projection.h b/intern/cycles/kernel/camera/projection.h index ddbe8ad5748..7b4e23e4ed0 100644 --- a/intern/cycles/kernel/camera/projection.h +++ b/intern/cycles/kernel/camera/projection.h @@ -146,16 +146,15 @@ fisheye_equisolid_to_direction(float u, float v, float lens, float fov, float wi return make_float3(cosf(theta), -cosf(phi) * sinf(theta), sinf(phi) * sinf(theta)); } -ccl_device_inline float3 -fisheye_lens_polynomial_to_direction(float u, float v, float coeff0, float4 coeffs, - float fov, float width, float height) +ccl_device_inline float3 fisheye_lens_polynomial_to_direction( + float u, float v, float coeff0, float4 coeffs, float fov, float width, float height) { u = (u - 0.5f) * width; v = (v - 0.5f) * height; float r = sqrtf(u * u + v * v); - float r2 = r*r; - float4 rr = make_float4(r, r2, r2*r, r2*r2); + float r2 = r * r; + float4 rr = make_float4(r, r2, r2 * r, r2 * r2); float theta = -(coeff0 + dot(coeffs, rr)); if (fabsf(theta) > 0.5f * fov) @@ -169,16 +168,16 @@ fisheye_lens_polynomial_to_direction(float u, float v, float coeff0, float4 coef return make_float3(cosf(theta), -cosf(phi) * sinf(theta), sinf(phi) * sinf(theta)); } -ccl_device float2 direction_to_fisheye_lens_polynomial(float3 dir, float coeff0, float4 coeffs, - float width, float height) +ccl_device float2 direction_to_fisheye_lens_polynomial( + float3 dir, float coeff0, float4 coeffs, float width, float height) { float theta = -safe_acosf(dir.x); float r = (theta - coeff0) / coeffs.x; - for (int i=0; i<20; i++) { - float r2 = r*r; - float4 rr = make_float4(r, r2, r2*r, r2*r2); + for (int i = 0; i < 20; i++) { + float r2 = r * r; + float4 rr = make_float4(r, r2, r2 * r, r2 * r2); r = (theta - (coeff0 + dot(coeffs, rr))) / coeffs.x; } @@ -190,7 +189,6 @@ ccl_device float2 direction_to_fisheye_lens_polynomial(float3 dir, float coeff0, return make_float2(u, v); } - /* Mirror Ball <-> Cartesion direction */ ccl_device float3 mirrorball_to_direction(float u, float v) @@ -237,9 +235,13 @@ ccl_device_inline float3 panorama_to_direction(ccl_constant KernelCamera *cam, f case PANORAMA_FISHEYE_EQUIDISTANT: return fisheye_to_direction(u, v, cam->fisheye_fov); case PANORAMA_FISHEYE_LENS_POLYNOMIAL: - return fisheye_lens_polynomial_to_direction( - u, v, cam->fisheye_lens_polynomial_bias, cam->fisheye_lens_polynomial_coefficients, cam->fisheye_fov, - cam->sensorwidth, cam->sensorheight); + return fisheye_lens_polynomial_to_direction(u, + v, + cam->fisheye_lens_polynomial_bias, + cam->fisheye_lens_polynomial_coefficients, + cam->fisheye_fov, + cam->sensorwidth, + cam->sensorheight); case PANORAMA_FISHEYE_EQUISOLID: default: return fisheye_equisolid_to_direction( @@ -257,9 +259,11 @@ ccl_device_inline float2 direction_to_panorama(ccl_constant KernelCamera *cam, f case PANORAMA_FISHEYE_EQUIDISTANT: return direction_to_fisheye(dir, cam->fisheye_fov); case PANORAMA_FISHEYE_LENS_POLYNOMIAL: - return direction_to_fisheye_lens_polynomial( - dir, cam->fisheye_lens_polynomial_bias, cam->fisheye_lens_polynomial_coefficients, - cam->sensorwidth, cam->sensorheight); + return direction_to_fisheye_lens_polynomial(dir, + cam->fisheye_lens_polynomial_bias, + cam->fisheye_lens_polynomial_coefficients, + cam->sensorwidth, + cam->sensorheight); case PANORAMA_FISHEYE_EQUISOLID: default: return direction_to_fisheye_equisolid( diff --git a/intern/cycles/scene/camera.cpp b/intern/cycles/scene/camera.cpp index 12e106779e3..2f3b55f887f 100644 --- a/intern/cycles/scene/camera.cpp +++ b/intern/cycles/scene/camera.cpp @@ -426,8 +426,8 @@ void Camera::update(Scene *scene) latitude_min - latitude_max, -latitude_min + M_PI_2_F); kcam->fisheye_lens_polynomial_bias = fisheye_polynomial_k0; - kcam->fisheye_lens_polynomial_coefficients = make_float4(fisheye_polynomial_k1, fisheye_polynomial_k2, - fisheye_polynomial_k3, fisheye_polynomial_k4); + kcam->fisheye_lens_polynomial_coefficients = make_float4( + fisheye_polynomial_k1, fisheye_polynomial_k2, fisheye_polynomial_k3, fisheye_polynomial_k4); switch (stereo_eye) { case STEREO_LEFT: diff --git a/source/blender/nodes/NOD_socket_declarations.hh b/source/blender/nodes/NOD_socket_declarations.hh index 98c8fa68876..1b78a09d6a8 100644 --- a/source/blender/nodes/NOD_socket_declarations.hh +++ b/source/blender/nodes/NOD_socket_declarations.hh @@ -226,7 +226,8 @@ class Shader : public SocketDeclaration { bool matches(const bNodeSocket &socket) const override; }; -class ShaderBuilder : public SocketDeclarationBuilder {}; +class ShaderBuilder : public SocketDeclarationBuilder { +}; /* -------------------------------------------------------------------- */ /** \name #FloatBuilder Inline Methods diff --git a/source/blender/nodes/composite/nodes/node_composite_common.cc b/source/blender/nodes/composite/nodes/node_composite_common.cc index baea93a78f4..f76ab765a51 100644 --- a/source/blender/nodes/composite/nodes/node_composite_common.cc +++ b/source/blender/nodes/composite/nodes/node_composite_common.cc @@ -38,8 +38,7 @@ void register_node_type_cmp_group() /* NOTE: Cannot use sh_node_type_base for node group, because it would map the node type * to the shared NODE_GROUP integer type id. */ - node_type_base_custom( - &ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP, 0); + node_type_base_custom(&ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP, 0); ntype.type = NODE_GROUP; ntype.poll = cmp_node_poll_default; ntype.poll_instance = node_group_poll_instance; diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index bf9df0b3a36..446a43b638d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -297,8 +297,8 @@ static bool node_poll_cryptomatte(bNodeType *UNUSED(ntype), } if (scene == nullptr) { - *r_disabled_hint = - TIP_("The node tree must be the compositing node tree of any scene in the file"); + *r_disabled_hint = TIP_( + "The node tree must be the compositing node tree of any scene in the file"); } return scene != nullptr; } diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc index 748596ff9e3..3f4089807bc 100644 --- a/source/blender/nodes/geometry/node_geometry_tree.cc +++ b/source/blender/nodes/geometry/node_geometry_tree.cc @@ -113,7 +113,8 @@ static bool geometry_node_tree_socket_type_valid(bNodeTreeType *UNUSED(ntreetype SOCK_MATERIAL); } -void register_node_tree_type_geo(){ +void register_node_tree_type_geo() +{ bNodeTreeType *tt = ntreeType_Geometry = static_cast( MEM_callocN(sizeof(bNodeTreeType), "geometry node tree type")); tt->type = NTREE_GEOMETRY; diff --git a/source/blender/nodes/geometry/nodes/node_geo_common.cc b/source/blender/nodes/geometry/nodes/node_geo_common.cc index 630d2157d32..1a8d04e5da9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_common.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_common.cc @@ -22,7 +22,8 @@ #include "node_common.h" #include "node_geometry_util.hh" -void register_node_type_geo_group(){ +void register_node_type_geo_group() +{ static bNodeType ntype; node_type_base_custom(&ntype, "GeometryNodeGroup", "Group", NODE_CLASS_GROUP, 0); diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc index 5aaa42ecb45..0003f15854d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc @@ -410,7 +410,8 @@ static void node_geo_exec(GeoNodeExecParams params) } // namespace blender::nodes::node_geo_image_texture_cc -void register_node_type_geo_image_texture(){ +void register_node_type_geo_image_texture() +{ namespace file_ns = blender::nodes::node_geo_image_texture_cc; static bNodeType ntype; diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc index 3ee5831494d..6c3457151e5 100644 --- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc @@ -75,7 +75,8 @@ static void sh_node_clamp_build_multi_function(blender::nodes::NodeMultiFunction } } -void register_node_type_sh_clamp(){ +void register_node_type_sh_clamp() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_CLAMP, "Clamp", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc index 1241d299584..09bbf3d851c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_curves.cc +++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc @@ -152,7 +152,8 @@ static void sh_node_curve_vec_build_multi_function( builder.construct_and_set_matching_fn(*cumap); } -void register_node_type_sh_curve_vec(){ +void register_node_type_sh_curve_vec() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_CURVE_VEC, "Vector Curves", NODE_CLASS_OP_VECTOR, 0); @@ -328,7 +329,8 @@ static void sh_node_curve_rgb_build_multi_function( builder.construct_and_set_matching_fn(*cumap); } -void register_node_type_sh_curve_rgb(){ +void register_node_type_sh_curve_rgb() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_CURVE_RGB, "RGB Curves", NODE_CLASS_OP_COLOR, 0); @@ -471,7 +473,8 @@ static void sh_node_curve_float_build_multi_function( builder.construct_and_set_matching_fn(*cumap); } -void register_node_type_sh_curve_float(){ +void register_node_type_sh_curve_float() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_CURVE_FLOAT, "Float Curve", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_map_range.cc b/source/blender/nodes/shader/nodes/node_shader_map_range.cc index 8abf7a21548..347cba84643 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -307,7 +307,8 @@ static void sh_node_map_range_build_multi_function( } } -void register_node_type_sh_map_range(){ +void register_node_type_sh_map_range() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_MAP_RANGE, "Map Range", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc index f2508462bc8..a9d6491f4be 100644 --- a/source/blender/nodes/shader/nodes/node_shader_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_math.cc @@ -161,7 +161,8 @@ static void sh_node_math_build_multi_function(blender::nodes::NodeMultiFunctionB } } -void register_node_type_sh_math(){ +void register_node_type_sh_math() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_MATH, "Math", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc index 403dbca45f4..8fbd6a9e6e1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc @@ -183,7 +183,8 @@ static void sh_node_mix_rgb_build_multi_function(blender::nodes::NodeMultiFuncti builder.construct_and_set_matching_fn(clamp, mix_type); } -void register_node_type_sh_mix_rgb(){ +void register_node_type_sh_mix_rgb() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc b/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc index c3ec2aa9e22..e3808985c0e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc +++ b/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc @@ -172,7 +172,8 @@ static void sh_node_valtorgb_build_multi_function( builder.construct_and_set_matching_fn(*color_band); } -void register_node_type_sh_valtorgb(){ +void register_node_type_sh_valtorgb() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_VALTORGB, "ColorRamp", NODE_CLASS_CONVERTER, 0); @@ -221,7 +222,8 @@ static int gpu_shader_rgbtobw(GPUMaterial *mat, return GPU_stack_link(mat, node, "rgbtobw", in, out); } -void register_node_type_sh_rgbtobw(){ +void register_node_type_sh_rgbtobw() +{ static bNodeType ntype; sh_node_type_base(&ntype, SH_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc index 504d6f21e44..4984a530d8b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc @@ -103,7 +103,8 @@ static void sh_node_seprgb_build_multi_function(blender::nodes::NodeMultiFunctio builder.set_matching_fn(fn); } -void register_node_type_sh_seprgb(){ +void register_node_type_sh_seprgb() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_SEPRGB, "Separate RGB", NODE_CLASS_CONVERTER, 0); @@ -162,7 +163,8 @@ static void sh_node_combrgb_build_multi_function(blender::nodes::NodeMultiFuncti builder.set_matching_fn(fn); } -void register_node_type_sh_combrgb(){ +void register_node_type_sh_combrgb() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_COMBRGB, "Combine RGB", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc index 58bb4c3f577..a414630829e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc @@ -88,7 +88,8 @@ static void sh_node_sepxyz_build_multi_function(blender::nodes::NodeMultiFunctio builder.set_matching_fn(separate_fn); } -void register_node_type_sh_sepxyz(){ +void register_node_type_sh_sepxyz() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_SEPXYZ, "Separate XYZ", NODE_CLASS_CONVERTER, 0); @@ -128,7 +129,8 @@ static void sh_node_combxyz_build_multi_function(blender::nodes::NodeMultiFuncti builder.set_matching_fn(fn); } -void register_node_type_sh_combxyz(){ +void register_node_type_sh_combxyz() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_COMBXYZ, "Combine XYZ", NODE_CLASS_CONVERTER, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc index a737b494d87..7925c96db3d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc @@ -268,7 +268,8 @@ static void sh_node_brick_build_multi_function(blender::nodes::NodeMultiFunction } // namespace blender::nodes -void register_node_type_sh_tex_brick(){ +void register_node_type_sh_tex_brick() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_BRICK, "Brick Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc index 738f61a25d3..6d2d199aec8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc @@ -123,7 +123,8 @@ static void sh_node_tex_checker_build_multi_function( } // namespace blender::nodes -void register_node_type_sh_tex_checker(){ +void register_node_type_sh_tex_checker() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_CHECKER, "Checker Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc index 4c4824ef631..48199968547 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc @@ -160,7 +160,8 @@ static void sh_node_gradient_tex_build_multi_function( } // namespace blender::nodes -void register_node_type_sh_tex_gradient(){ +void register_node_type_sh_tex_gradient() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_GRADIENT, "Gradient Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc index 8de31546f5d..41f7e5438ea 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc @@ -174,7 +174,8 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, } /* node type definition */ -void register_node_type_sh_tex_image(){ +void register_node_type_sh_tex_image() +{ static bNodeType ntype; sh_node_type_base(&ntype, SH_NODE_TEX_IMAGE, "Image Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc index 8f52fe8a50c..9bd5c335cee 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -181,7 +181,8 @@ static void sh_node_magic_tex_build_multi_function( } // namespace blender::nodes -void register_node_type_sh_tex_magic(){ +void register_node_type_sh_tex_magic() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_MAGIC, "Magic Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc index 896ebfefe68..9504b0dc9f0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -533,7 +533,8 @@ static void sh_node_musgrave_build_multi_function( } // namespace blender::nodes -void register_node_type_sh_tex_musgrave(){ +void register_node_type_sh_tex_musgrave() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_MUSGRAVE, "Musgrave Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc index ddef30d95dc..e3764120663 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -250,7 +250,8 @@ static void sh_node_noise_build_multi_function(blender::nodes::NodeMultiFunction } // namespace blender::nodes /* node type definition */ -void register_node_type_sh_tex_noise(){ +void register_node_type_sh_tex_noise() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_NOISE, "Noise Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc index 2b6c3ea3d4f..6968a7483b6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc @@ -1329,7 +1329,8 @@ static void sh_node_voronoi_build_multi_function(blender::nodes::NodeMultiFuncti } // namespace blender::nodes -void register_node_type_sh_tex_voronoi(){ +void register_node_type_sh_tex_voronoi() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_VORONOI, "Voronoi Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc index d3ce2ee8626..d3e25b533e5 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc @@ -218,7 +218,8 @@ static void sh_node_wave_tex_build_multi_function( } // namespace blender::nodes -void register_node_type_sh_tex_wave(){ +void register_node_type_sh_tex_wave() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_TEX_WAVE, "Wave Texture", NODE_CLASS_TEXTURE, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc index 6b013882dc3..f2dfd2e6968 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc @@ -191,7 +191,8 @@ static void sh_node_noise_build_multi_function(blender::nodes::NodeMultiFunction } // namespace blender::nodes -void register_node_type_sh_tex_white_noise(){ +void register_node_type_sh_tex_white_noise() +{ static bNodeType ntype; sh_fn_node_type_base( diff --git a/source/blender/nodes/shader/nodes/node_shader_value.cc b/source/blender/nodes/shader/nodes/node_shader_value.cc index 35d32062cf8..f0eb3ea9bee 100644 --- a/source/blender/nodes/shader/nodes/node_shader_value.cc +++ b/source/blender/nodes/shader/nodes/node_shader_value.cc @@ -49,7 +49,8 @@ static void sh_node_value_build_multi_function(blender::nodes::NodeMultiFunction builder.construct_and_set_matching_fn>(value->value); } -void register_node_type_sh_value(){ +void register_node_type_sh_value() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_VALUE, "Value", NODE_CLASS_INPUT, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc index 8b2714dcb31..e0cbaa4df9e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -279,7 +279,8 @@ static void sh_node_vector_math_build_multi_function( builder.set_matching_fn(fn); } -void register_node_type_sh_vect_math(){ +void register_node_type_sh_vect_math() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_VECTOR_MATH, "Vector Math", NODE_CLASS_OP_VECTOR, 0); diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc index 8aec69556a7..a3cb82f3245 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc @@ -205,7 +205,8 @@ static void node_shader_update_vector_rotate(bNodeTree *ntree, bNode *node) ntree, sock_angle, !ELEM(node->custom1, NODE_VECTOR_ROTATE_TYPE_EULER_XYZ)); } -void register_node_type_sh_vector_rotate(){ +void register_node_type_sh_vector_rotate() +{ static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_VECTOR_ROTATE, "Vector Rotate", NODE_CLASS_OP_VECTOR, 0); diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c index 966d05b4a16..72690d6ccfe 100644 --- a/source/blender/nodes/texture/nodes/node_texture_bricks.c +++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c @@ -21,7 +21,6 @@ * \ingroup texnodes */ - #include "NOD_texture.h" #include "node_texture_util.h"