From c8b5b17d40c4e969fada2e89873edaf0dda5cd30 Mon Sep 17 00:00:00 2001 From: Chris Blackbourn Date: Wed, 17 May 2023 10:40:23 +1200 Subject: [PATCH] Cleanup: format --- source/blender/blenkernel/BKE_node.hh | 1 - source/blender/blenkernel/intern/sound.c | 2 +- source/blender/editors/space_view3d/view3d_gizmo_ruler.cc | 6 ++---- .../nodes/geometry/nodes/node_geo_instance_on_points.cc | 3 +-- source/blender/nodes/shader/nodes/node_shader_mix.cc | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/source/blender/blenkernel/BKE_node.hh b/source/blender/blenkernel/BKE_node.hh index 9025d86d8cb..d6c8353da42 100644 --- a/source/blender/blenkernel/BKE_node.hh +++ b/source/blender/blenkernel/BKE_node.hh @@ -39,7 +39,6 @@ bNodeTree *ntreeCopyTree(Main *bmain, const bNodeTree *ntree); void ntreeFreeLocalNode(bNodeTree *ntree, bNode *node); - void ntreeUpdateAllNew(Main *main); void ntreeNodeFlagSet(const bNodeTree *ntree, int flag, bool enable); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 5080ab77ebd..ebf3b6a7f65 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -1387,7 +1387,7 @@ void BKE_sound_set_scene_sound_pitch(void *UNUSED(handle), void BKE_sound_set_scene_sound_pitch_at_frame(void *UNUSED(handle), int UNUSED(frame), float UNUSED(pitch), - char(animated)); + char UNUSED(animated)) { } void BKE_sound_set_scene_sound_pitch_constant_range(void *UNUSED(handle), diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc index 5e3ef457771..b2f2def2be2 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc @@ -421,8 +421,7 @@ static bool view3d_ruler_item_mousemove(const bContext *C, #ifdef USE_AXIS_CONSTRAINTS if (!(ruler_item->flag & RULERITEM_USE_ANGLE) && - ruler_info->constrain_mode != CONSTRAIN_MODE_OFF) - { + ruler_info->constrain_mode != CONSTRAIN_MODE_OFF) { Scene *scene = DEG_get_input_scene(depsgraph); ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph); @@ -1386,8 +1385,7 @@ static int view3d_ruler_remove_invoke(bContext *C, wmOperator *op, const wmEvent if (ruler_info->item_active) { RulerItem *ruler_item = ruler_info->item_active; if ((ruler_item->flag & RULERITEM_USE_ANGLE) && - (ruler_item->flag & RULERITEM_USE_ANGLE_ACTIVE)) - { + (ruler_item->flag & RULERITEM_USE_ANGLE_ACTIVE)) { ruler_item->flag &= ~(RULERITEM_USE_ANGLE | RULERITEM_USE_ANGLE_ACTIVE); } else { diff --git a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc index 931486918a5..936fc76fe6f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc @@ -170,8 +170,7 @@ static void add_instances_from_component( const eCustomDataType type = bke::cpp_type_to_custom_data_type(src.varray.type()); if (src.varray.size() == dst_component.instances_num() && src.sharing_info && - src.varray.is_span()) - { + src.varray.is_span()) { const bke::AttributeInitShared init(src.varray.get_internal_span().data(), *src.sharing_info); dst_attributes.add(id, ATTR_DOMAIN_INSTANCE, type, init); diff --git a/source/blender/nodes/shader/nodes/node_shader_mix.cc b/source/blender/nodes/shader/nodes/node_shader_mix.cc index 5f46d1a3fd9..b32bd11570e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix.cc @@ -225,8 +225,7 @@ static void node_mix_gather_link_searches(GatherLinkSearchOpParams ¶ms) } const std::string socket_name = params.in_out() == SOCK_IN ? "A" : "Result"; for (const EnumPropertyItem *item = rna_enum_ramp_blend_items; item->identifier != nullptr; - item++) - { + item++) { if (item->name != nullptr && item->identifier[0] != '\0') { params.add_item(CTX_IFACE_(BLT_I18NCONTEXT_ID_NODETREE, item->name), SocketSearchOp{socket_name, item->value},