diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2022-01-10 02:24:48 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2022-01-10 02:24:48 +0300 |
commit | 17c7bac4052e1b5061d0cfdee5096d5e30837cc2 (patch) | |
tree | a7905c80fbc884daf651701835259be223e69e5a /source/blender/nodes | |
parent | 6110f3aa1f4df2f477c88cbe6f57747f3ea2717a (diff) |
Cleanup: redundent semicolons after function braces
Diffstat (limited to 'source/blender/nodes')
50 files changed, 86 insertions, 86 deletions
diff --git a/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc b/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc index 582e6748a1e..9470b82a8eb 100644 --- a/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc +++ b/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc @@ -27,7 +27,7 @@ static void fn_node_legacy_random_float_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f); b.add_input<decl::Int>(N_("Seed")).min(-10000).max(10000); b.add_output<decl::Float>(N_("Value")); -}; +} class RandomFloatFunction : public blender::fn::MultiFunction { public: diff --git a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc index e8c05defe7c..cd05f07d392 100644 --- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc +++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc @@ -32,7 +32,7 @@ static void fn_node_boolean_math_declare(NodeDeclarationBuilder &b) b.add_input<decl::Bool>(N_("Boolean"), "Boolean"); b.add_input<decl::Bool>(N_("Boolean"), "Boolean_001"); b.add_output<decl::Bool>(N_("Boolean")); -}; +} static void fn_node_boolean_math_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index 28a6093e849..3bb46511eeb 100644 --- a/source/blender/nodes/function/nodes/node_fn_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_compare.cc @@ -55,7 +55,7 @@ static void fn_node_compare_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Epsilon")).default_value(0.001).min(-10000.0f).max(10000.0f); b.add_output<decl::Bool>(N_("Result")); -}; +} static void geo_node_compare_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc index 1a130e748d5..488787980dc 100644 --- a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc @@ -32,7 +32,7 @@ static void fn_node_float_to_int_declare(NodeDeclarationBuilder &b) b.is_function_node(); b.add_input<decl::Float>(N_("Float")); b.add_output<decl::Int>(N_("Integer")); -}; +} static void fn_node_float_to_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_input_bool.cc b/source/blender/nodes/function/nodes/node_fn_input_bool.cc index b6f7c802cc9..583570effd9 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc @@ -26,7 +26,7 @@ namespace blender::nodes::node_fn_input_bool_cc { static void fn_node_input_bool_declare(NodeDeclarationBuilder &b) { b.add_output<decl::Bool>(N_("Boolean")); -}; +} static void fn_node_input_bool_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_input_color.cc b/source/blender/nodes/function/nodes/node_fn_input_color.cc index 5ace57810e1..1fad5b2f5f4 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc @@ -24,7 +24,7 @@ namespace blender::nodes::node_fn_input_color_cc { static void fn_node_input_color_declare(NodeDeclarationBuilder &b) { b.add_output<decl::Color>(N_("Color")); -}; +} static void fn_node_input_color_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_input_int.cc b/source/blender/nodes/function/nodes/node_fn_input_int.cc index d96339ae365..dc30ecb253c 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc @@ -26,7 +26,7 @@ namespace blender::nodes::node_fn_input_int_cc { static void fn_node_input_int_declare(NodeDeclarationBuilder &b) { b.add_output<decl::Int>(N_("Integer")); -}; +} static void fn_node_input_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc b/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc index 8137b424143..681bc16a301 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc @@ -22,7 +22,7 @@ static void fn_node_input_special_characters_declare(NodeDeclarationBuilder &b) { b.add_output<decl::String>(N_("Line Break")); b.add_output<decl::String>(N_("Tab")); -}; +} class MF_SpecialCharacters : public fn::MultiFunction { public: diff --git a/source/blender/nodes/function/nodes/node_fn_input_string.cc b/source/blender/nodes/function/nodes/node_fn_input_string.cc index a326caf50bd..4abb352d802 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_string.cc @@ -25,7 +25,7 @@ static void fn_node_input_string_declare(NodeDeclarationBuilder &b) { b.is_function_node(); b.add_output<decl::String>(N_("String")); -}; +} static void fn_node_input_string_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_input_vector.cc b/source/blender/nodes/function/nodes/node_fn_input_vector.cc index 34515c4414c..ba9600b461c 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_vector.cc @@ -26,7 +26,7 @@ namespace blender::nodes::node_fn_input_vector_cc { static void fn_node_input_vector_declare(NodeDeclarationBuilder &b) { b.add_output<decl::Vector>(N_("Vector")); -}; +} static void fn_node_input_vector_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/function/nodes/node_fn_replace_string.cc b/source/blender/nodes/function/nodes/node_fn_replace_string.cc index 243cb63d713..afe516a5214 100644 --- a/source/blender/nodes/function/nodes/node_fn_replace_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_replace_string.cc @@ -27,7 +27,7 @@ static void fn_node_replace_string_declare(NodeDeclarationBuilder &b) b.add_input<decl::String>(N_("Replace")) .description(N_("The string to replace each match with")); b.add_output<decl::String>(N_("String")); -}; +} static std::string replace_all(std::string str, const std::string &from, const std::string &to) { diff --git a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc index 582a9bb10a8..3140aeac975 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -34,7 +34,7 @@ static void fn_node_rotate_euler_declare(NodeDeclarationBuilder &b) b.add_input<decl::Vector>(N_("Axis")).default_value({0.0, 0.0, 1.0}).subtype(PROP_XYZ); b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE); b.add_output<decl::Vector>(N_("Rotation")); -}; +} static void fn_node_rotate_euler_update(bNodeTree *ntree, bNode *node) { diff --git a/source/blender/nodes/function/nodes/node_fn_slice_string.cc b/source/blender/nodes/function/nodes/node_fn_slice_string.cc index f9d0af5ba9b..4055495ec1f 100644 --- a/source/blender/nodes/function/nodes/node_fn_slice_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_slice_string.cc @@ -26,7 +26,7 @@ static void fn_node_slice_string_declare(NodeDeclarationBuilder &b) b.add_input<decl::Int>(N_("Position")); b.add_input<decl::Int>(N_("Length")).min(0).default_value(10); b.add_output<decl::String>(N_("String")); -}; +} static void fn_node_slice_string_build_multi_function(NodeMultiFunctionBuilder &builder) { diff --git a/source/blender/nodes/function/nodes/node_fn_string_length.cc b/source/blender/nodes/function/nodes/node_fn_string_length.cc index 8ab56812125..bed434c8f2c 100644 --- a/source/blender/nodes/function/nodes/node_fn_string_length.cc +++ b/source/blender/nodes/function/nodes/node_fn_string_length.cc @@ -26,7 +26,7 @@ static void fn_node_string_length_declare(NodeDeclarationBuilder &b) { b.add_input<decl::String>(N_("String")); b.add_output<decl::Int>(N_("Length")); -}; +} static void fn_node_string_length_build_multi_function(NodeMultiFunctionBuilder &builder) { diff --git a/source/blender/nodes/function/nodes/node_fn_value_to_string.cc b/source/blender/nodes/function/nodes/node_fn_value_to_string.cc index 235c612dc15..ee0613de9bd 100644 --- a/source/blender/nodes/function/nodes/node_fn_value_to_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_value_to_string.cc @@ -24,7 +24,7 @@ static void fn_node_value_to_string_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Value")); b.add_input<decl::Int>(N_("Decimals")).min(0); b.add_output<decl::String>(N_("String")); -}; +} static void fn_node_value_to_string_build_multi_function(NodeMultiFunctionBuilder &builder) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc index 5a088e16221..7d5c5b77ffd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc @@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Vector>(N_("Pivot Point")).subtype(PROP_TRANSLATION).supports_field(); b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field(); b.add_output<decl::Geometry>(N_("Instances")); -}; +} static void rotate_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc index 04c4e097f8d..5bd2028ff41 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc @@ -31,7 +31,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Vector>(N_("Center")).subtype(PROP_TRANSLATION).supports_field(); b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field(); b.add_output<decl::Geometry>(N_("Instances")); -}; +} static void scale_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_join.cc b/source/blender/nodes/geometry/nodes/node_geo_string_join.cc index 0fbe9a41ca5..176fcf3178a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_join.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_join.cc @@ -23,7 +23,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::String>(N_("Delimiter")); b.add_input<decl::String>(N_("Strings")).multi_input().hide_value(); b.add_output<decl::String>(N_("String")); -}; +} static void node_geo_exec(GeoNodeExecParams params) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc index 1061ece49a9..763f8a3ccc3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc @@ -26,47 +26,47 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field(); b.add_input<decl::Vector>(N_("Translation")).subtype(PROP_TRANSLATION).supports_field(); b.add_input<decl::Bool>(N_("Local Space")).default_value(true).supports_field(); - b.add_output<decl::Geometry>(N_("Instances")); -}; + b.add_output<decl::Geometry>(N_("Instances")) -static void translate_instances(GeoNodeExecParams ¶ms, InstancesComponent &instances_component) -{ - GeometryComponentFieldContext field_context{instances_component, ATTR_DOMAIN_INSTANCE}; + static void + translate_instances(GeoNodeExecParams & params, InstancesComponent & instances_component) + { + GeometryComponentFieldContext field_context{instances_component, ATTR_DOMAIN_INSTANCE}; - fn::FieldEvaluator evaluator{field_context, instances_component.instances_amount()}; - evaluator.set_selection(params.extract_input<Field<bool>>("Selection")); - evaluator.add(params.extract_input<Field<float3>>("Translation")); - evaluator.add(params.extract_input<Field<bool>>("Local Space")); - evaluator.evaluate(); + fn::FieldEvaluator evaluator{field_context, instances_component.instances_amount()}; + evaluator.set_selection(params.extract_input<Field<bool>>("Selection")); + evaluator.add(params.extract_input<Field<float3>>("Translation")); + evaluator.add(params.extract_input<Field<bool>>("Local Space")); + evaluator.evaluate(); - const IndexMask selection = evaluator.get_evaluated_selection_as_mask(); - const VArray<float3> &translations = evaluator.get_evaluated<float3>(0); - const VArray<bool> &local_spaces = evaluator.get_evaluated<bool>(1); + const IndexMask selection = evaluator.get_evaluated_selection_as_mask(); + const VArray<float3> &translations = evaluator.get_evaluated<float3>(0); + const VArray<bool> &local_spaces = evaluator.get_evaluated<bool>(1); - MutableSpan<float4x4> instance_transforms = instances_component.instance_transforms(); + MutableSpan<float4x4> instance_transforms = instances_component.instance_transforms(); - threading::parallel_for(selection.index_range(), 1024, [&](IndexRange range) { - for (const int i_selection : range) { - const int i = selection[i_selection]; - if (local_spaces[i]) { - instance_transforms[i] *= float4x4::from_location(translations[i]); - } - else { - add_v3_v3(instance_transforms[i].values[3], translations[i]); + threading::parallel_for(selection.index_range(), 1024, [&](IndexRange range) { + for (const int i_selection : range) { + const int i = selection[i_selection]; + if (local_spaces[i]) { + instance_transforms[i] *= float4x4::from_location(translations[i]); + } + else { + add_v3_v3(instance_transforms[i].values[3], translations[i]); + } } - } - }); -} + }); + } -static void node_geo_exec(GeoNodeExecParams params) -{ - GeometrySet geometry_set = params.extract_input<GeometrySet>("Instances"); - if (geometry_set.has_instances()) { - InstancesComponent &instances = geometry_set.get_component_for_write<InstancesComponent>(); - translate_instances(params, instances); + static void node_geo_exec(GeoNodeExecParams params) + { + GeometrySet geometry_set = params.extract_input<GeometrySet>("Instances"); + if (geometry_set.has_instances()) { + InstancesComponent &instances = geometry_set.get_component_for_write<InstancesComponent>(); + translate_instances(params, instances); + } + params.set_output("Instances", std::move(geometry_set)); } - params.set_output("Instances", std::move(geometry_set)); -} } // namespace blender::nodes::node_geo_translate_instances_cc diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc index 4d9cfc372ab..cd0f1b3c44d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc @@ -35,7 +35,7 @@ static void sh_node_clamp_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Min")).default_value(0.0f).min(-10000.0f).max(10000.0f); b.add_input<decl::Float>(N_("Max")).default_value(1.0f).min(-10000.0f).max(10000.0f); b.add_output<decl::Float>(N_("Result")); -}; +} static void node_shader_buts_clamp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc index 353cbf4ca15..d8c43e1d66b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc @@ -35,7 +35,7 @@ static void sh_node_valtorgb_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Fac")).default_value(0.5f).min(0.0f).max(1.0f).subtype(PROP_FACTOR); b.add_output<decl::Color>(N_("Color")); b.add_output<decl::Float>(N_("Alpha")); -}; +} static void node_shader_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node) { diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc index 67095561caf..bce59a60033 100644 --- a/source/blender/nodes/shader/nodes/node_shader_curves.cc +++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc @@ -31,7 +31,7 @@ static void sh_node_curve_vec_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); b.add_input<decl::Vector>(N_("Vector")).min(-1.0f).max(1.0f); b.add_output<decl::Vector>(N_("Vector")); -}; +} static void node_shader_init_curve_vec(bNodeTree *UNUSED(ntree), bNode *node) { @@ -164,7 +164,7 @@ static void sh_node_curve_rgb_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR); b.add_input<decl::Color>(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f}); b.add_output<decl::Color>(N_("Color")); -}; +} static void node_shader_init_curve_rgb(bNodeTree *UNUSED(ntree), bNode *node) { @@ -326,7 +326,7 @@ static void sh_node_curve_float_declare(NodeDeclarationBuilder &b) .subtype(PROP_FACTOR); b.add_input<decl::Float>(N_("Value")).default_value(1.0f).is_default_link_socket(); b.add_output<decl::Float>(N_("Value")); -}; +} static void node_shader_init_curve_float(bNodeTree *UNUSED(ntree), bNode *node) { 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 71adf607869..3276a1bfd72 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -53,7 +53,7 @@ static void sh_node_map_range_declare(NodeDeclarationBuilder &b) b.add_input<decl::Vector>(N_("Steps"), "Steps_FLOAT3").default_value(float3(4.0f)); b.add_output<decl::Float>(N_("Result")); b.add_output<decl::Vector>(N_("Vector")); -}; +} static void node_shader_buts_map_range(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc index ca30b16f7ff..50585405cbf 100644 --- a/source/blender/nodes/shader/nodes/node_shader_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_math.cc @@ -45,7 +45,7 @@ static void sh_node_math_declare(NodeDeclarationBuilder &b) .min(-10000.0f) .max(10000.0f); b.add_output<decl::Float>(N_("Value")); -}; +} class SocketSearchOp { public: 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 7f9dc8424cf..9678e86d289 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc @@ -32,7 +32,7 @@ static void sh_node_mix_rgb_declare(NodeDeclarationBuilder &b) b.add_input<decl::Color>(N_("Color1")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); b.add_input<decl::Color>(N_("Color2")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); b.add_output<decl::Color>(N_("Color")); -}; +} static const char *gpu_shader_get_name(int mode) { diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc b/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc index c320fafa2ef..d9aa906e451 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc @@ -27,7 +27,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Shader>(N_("Shader")); b.add_input<decl::Shader>(N_("Shader"), "Shader_001"); b.add_output<decl::Shader>(N_("Shader")); -}; +} static int node_shader_gpu_mix_shader(GPUMaterial *mat, bNode *node, diff --git a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc index 93e1573796f..6ffd763b0d1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc @@ -30,7 +30,7 @@ static void node_declare(NodeDeclarationBuilder &b) { b.add_input<decl::Color>(N_("Color")).default_value({0.0f, 0.0f, 0.0f, 1.0f}); b.add_input<decl::Float>(N_("Value")).default_value(0.0f).min(0.0f).max(1.0f); -}; +} static void node_shader_buts_output_aov(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/shader/nodes/node_shader_output_light.cc b/source/blender/nodes/shader/nodes/node_shader_output_light.cc index 05eec40e020..0c8288f801b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_light.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_light.cc @@ -24,7 +24,7 @@ namespace blender::nodes::node_shader_output_light_cc { static void node_declare(NodeDeclarationBuilder &b) { b.add_input<decl::Shader>(N_("Surface")); -}; +} } // namespace blender::nodes::node_shader_output_light_cc diff --git a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc index ce6771f652f..9b6c3292e75 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc @@ -42,7 +42,7 @@ static void node_declare(NodeDeclarationBuilder &b) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR); -}; +} static void node_buts_output_linestyle(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.cc b/source/blender/nodes/shader/nodes/node_shader_output_material.cc index 7d46e8e28fc..5fc95b92e3f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_material.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_material.cc @@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Shader>(N_("Surface")); b.add_input<decl::Shader>(N_("Volume")); b.add_input<decl::Vector>(N_("Displacement")).hide_value(); -}; +} static int node_shader_gpu_output_material(GPUMaterial *mat, bNode *node, diff --git a/source/blender/nodes/shader/nodes/node_shader_output_world.cc b/source/blender/nodes/shader/nodes/node_shader_output_world.cc index 9ea325bbf78..501dc088cbe 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_world.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_world.cc @@ -25,7 +25,7 @@ static void node_declare(NodeDeclarationBuilder &b) { b.add_input<decl::Shader>(N_("Surface")); b.add_input<decl::Shader>(N_("Volume")); -}; +} static int node_shader_gpu_output_world(GPUMaterial *mat, bNode *node, diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.cc b/source/blender/nodes/shader/nodes/node_shader_particle_info.cc index 163a5d6ebfe..d68d0fe0d72 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.cc @@ -36,7 +36,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("Size")); b.add_output<decl::Vector>(N_("Velocity")); b.add_output<decl::Vector>(N_("Angular Velocity")); -}; +} static int gpu_shader_particle_info(GPUMaterial *mat, bNode *node, 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 d93c2326490..13ba056d9ee 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 @@ -31,7 +31,7 @@ static void sh_node_rgbtobw_declare(NodeDeclarationBuilder &b) { b.add_input<decl::Color>(N_("Color")).default_value({0.5f, 0.5f, 0.5f, 1.0f}); b.add_output<decl::Float>(N_("Val")); -}; +} static int gpu_shader_rgbtobw(GPUMaterial *mat, bNode *node, 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 5ca2d4e2f68..d4be0bd14dc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc @@ -32,7 +32,7 @@ static void sh_node_seprgb_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("R")); b.add_output<decl::Float>(N_("G")); b.add_output<decl::Float>(N_("B")); -}; +} static int gpu_shader_seprgb(GPUMaterial *mat, bNode *node, @@ -111,7 +111,7 @@ static void sh_node_combrgb_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("G")).min(0.0f).max(1.0f); b.add_input<decl::Float>(N_("B")).min(0.0f).max(1.0f); b.add_output<decl::Color>(N_("Image")); -}; +} static int gpu_shader_combrgb(GPUMaterial *mat, bNode *node, 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 57eef716e88..f8064eb192a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc @@ -32,7 +32,7 @@ static void sh_node_sepxyz_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("X")); b.add_output<decl::Float>(N_("Y")); b.add_output<decl::Float>(N_("Z")); -}; +} static int gpu_shader_sepxyz(GPUMaterial *mat, bNode *node, @@ -111,7 +111,7 @@ static void sh_node_combxyz_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Y")).min(-10000.0f).max(10000.0f); b.add_input<decl::Float>(N_("Z")).min(-10000.0f).max(10000.0f); b.add_output<decl::Vector>(N_("Vector")); -}; +} static int gpu_shader_combxyz(GPUMaterial *mat, bNode *node, diff --git a/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc index 2e0ba3f1a36..153b1abfbca 100644 --- a/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc @@ -26,7 +26,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Shader>(N_("Shader")); b.add_output<decl::Color>(N_("Color")); b.add_output<decl::Float>(N_("Alpha")); -}; +} static int node_shader_gpu_shadertorgb(GPUMaterial *mat, bNode *node, diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index fb5637648f7..c4e5660b9f8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -29,7 +29,7 @@ namespace blender::nodes::node_shader_tangent_cc { static void node_declare(NodeDeclarationBuilder &b) { b.add_output<decl::Vector>(N_("Tangent")); -}; +} static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *ptr) { 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 b8cb00a6487..61b1613c11a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc @@ -58,7 +58,7 @@ static void sh_node_tex_brick_declare(NodeDeclarationBuilder &b) .no_muted_links(); b.add_output<decl::Color>(N_("Color")); b.add_output<decl::Float>(N_("Fac")); -}; +} static void node_shader_buts_tex_brick(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 f22af9f4963..6022f13821a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc @@ -34,7 +34,7 @@ static void sh_node_tex_checker_declare(NodeDeclarationBuilder &b) .no_muted_links(); b.add_output<decl::Color>(N_("Color")); b.add_output<decl::Float>(N_("Fac")); -}; +} static void node_shader_init_tex_checker(bNodeTree *UNUSED(ntree), bNode *node) { 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 352cde0b947..85e0f262ca7 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc @@ -30,7 +30,7 @@ static void sh_node_tex_gradient_declare(NodeDeclarationBuilder &b) b.add_input<decl::Vector>(N_("Vector")).hide_value().implicit_field(); b.add_output<decl::Color>(N_("Color")).no_muted_links(); b.add_output<decl::Float>(N_("Fac")).no_muted_links(); -}; +} static void node_shader_buts_tex_gradient(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 745121691ac..d5479f46a35 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc @@ -27,7 +27,7 @@ static void sh_node_tex_image_declare(NodeDeclarationBuilder &b) b.add_input<decl::Vector>(N_("Vector")).implicit_field(); b.add_output<decl::Color>(N_("Color")).no_muted_links(); b.add_output<decl::Float>(N_("Alpha")).no_muted_links(); -}; +} static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node) { 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 22a0532b57b..e40914783b6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -32,7 +32,7 @@ static void sh_node_tex_magic_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(1.0f); b.add_output<decl::Color>(N_("Color")).no_muted_links(); b.add_output<decl::Float>(N_("Fac")).no_muted_links(); -}; +} static void node_shader_buts_tex_magic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 52ab70848de..45c2a83c178 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -43,7 +43,7 @@ static void sh_node_tex_musgrave_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Offset")).min(-1000.0f).max(1000.0f); b.add_input<decl::Float>(N_("Gain")).min(0.0f).max(1000.0f).default_value(1.0f); b.add_output<decl::Float>(N_("Fac")).no_muted_links(); -}; +} static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 9e378ff0110..0e549859a39 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -46,7 +46,7 @@ static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Distortion")).min(-1000.0f).max(1000.0f).default_value(0.0f); b.add_output<decl::Float>(N_("Fac")).no_muted_links(); b.add_output<decl::Color>(N_("Color")).no_muted_links(); -}; +} static void node_shader_buts_tex_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 22f02fecffd..2b5c1ddfe21 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc @@ -63,7 +63,7 @@ static void sh_node_tex_voronoi_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("Radius")).no_muted_links().make_available([](bNode &node) { node_storage(node).feature = SHD_VORONOI_N_SPHERE_RADIUS; }); -}; +} static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 1216614a8ef..fc6c66061ff 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc @@ -42,7 +42,7 @@ static void sh_node_tex_wave_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Phase Offset")).min(-1000.0f).max(1000.0f).default_value(0.0f); b.add_output<decl::Color>(N_("Color")).no_muted_links(); b.add_output<decl::Float>(N_("Fac")).no_muted_links(); -}; +} static void node_shader_buts_tex_wave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 49bf622e2a5..3a5bc98896c 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 @@ -36,7 +36,7 @@ static void sh_node_tex_white_noise_declare(NodeDeclarationBuilder &b) }); b.add_output<decl::Float>(N_("Value")); b.add_output<decl::Color>(N_("Color")); -}; +} static void node_shader_buts_white_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { diff --git a/source/blender/nodes/shader/nodes/node_shader_value.cc b/source/blender/nodes/shader/nodes/node_shader_value.cc index 21f2e072990..265f03e6e88 100644 --- a/source/blender/nodes/shader/nodes/node_shader_value.cc +++ b/source/blender/nodes/shader/nodes/node_shader_value.cc @@ -28,7 +28,7 @@ namespace blender::nodes::node_shader_value_cc { static void sh_node_value_declare(NodeDeclarationBuilder &b) { b.add_output<decl::Float>(N_("Value")); -}; +} static int gpu_shader_value(GPUMaterial *mat, bNode *node, 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 1fa4d712d27..591734c7dd6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -42,7 +42,7 @@ static void sh_node_vector_math_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Scale")).default_value(1.0f).min(-10000.0f).max(10000.0f); b.add_output<decl::Vector>(N_("Vector")); b.add_output<decl::Float>(N_("Value")); -}; +} static void node_shader_buts_vect_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { 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 a59d3039e4e..d8dcd028c56 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc @@ -37,7 +37,7 @@ static void sh_node_vector_rotate_declare(NodeDeclarationBuilder &b) b.add_input<decl::Float>(N_("Angle")).subtype(PROP_ANGLE); b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER); b.add_output<decl::Vector>(N_("Vector")); -}; +} static void node_shader_buts_vector_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { |