From 7074c210ccf8b78fd5dfb0644d90b9e18cf4eb57 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Aug 2023 09:39:26 +1000 Subject: [PATCH] Cleanup: format --- scripts/presets/keyconfig/keymap_data/blender_default.py | 2 +- source/blender/blenkernel/BKE_action.h | 5 +++-- source/blender/blenkernel/BKE_layer.h | 4 ++-- source/blender/blenkernel/BKE_particle.h | 6 +++--- source/blender/blenkernel/intern/layer.cc | 4 ++-- source/blender/blenkernel/intern/particle.cc | 6 +++--- source/blender/editors/space_buttons/space_buttons.cc | 4 ++-- source/blender/editors/space_file/space_file.cc | 4 ++-- source/blender/editors/space_node/node_add.cc | 7 ++----- source/blender/editors/space_outliner/space_outliner.cc | 4 ++-- source/blender/editors/space_script/space_script.cc | 4 ++-- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index b29029c16fa..3c71a23cf40 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1812,7 +1812,7 @@ def km_graph_editor_generic(params): ), ("graph.extrapolation_type", {"type": 'E', "value": 'PRESS', "shift": True}, None), ("graph.fmodifier_add", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, - {"properties": [("only_active", False)]}), + {"properties": [("only_active", False)]}), ("anim.channels_select_filter", {"type": 'F', "value": 'PRESS', "ctrl": True}, None), *_template_items_hide_reveal_actions("graph.hide", "graph.reveal"), ("wm.context_set_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True}, diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index e9ba617f196..60e23a89393 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -391,8 +391,9 @@ void BKE_pose_blend_write(struct BlendWriter *writer, struct bPose *pose, struct void BKE_pose_blend_read_data(struct BlendDataReader *reader, struct ID *id_owner, struct bPose *pose) ATTR_NONNULL(1, 2); -void BKE_pose_blend_read_after_liblink(struct BlendLibReader *reader, struct Object *ob, struct bPose *pose) - ATTR_NONNULL(1, 2); +void BKE_pose_blend_read_after_liblink(struct BlendLibReader *reader, + struct Object *ob, + struct bPose *pose) ATTR_NONNULL(1, 2); /* `action_mirror.cc` */ diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index d67e32fad75..6c64f19f7e4 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -273,8 +273,8 @@ void BKE_view_layer_blend_write(struct BlendWriter *writer, struct ViewLayer *view_layer); void BKE_view_layer_blend_read_data(struct BlendDataReader *reader, struct ViewLayer *view_layer); void BKE_view_layer_blend_read_after_liblink(struct BlendLibReader *reader, - struct ID *self_id, - struct ViewLayer *view_layer); + struct ID *self_id, + struct ViewLayer *view_layer); /* iterators */ diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 51c4ee00f54..5217bc3ad5d 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -702,9 +702,9 @@ void BKE_particle_system_blend_write(struct BlendWriter *writer, struct ListBase void BKE_particle_system_blend_read_data(struct BlendDataReader *reader, struct ListBase *particles); void BKE_particle_system_blend_read_after_liblink(struct BlendLibReader *reader, - struct Object *ob, - struct ID *id, - struct ListBase *particles); + struct Object *ob, + struct ID *id, + struct ListBase *particles); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/layer.cc b/source/blender/blenkernel/intern/layer.cc index 6e035c2dc5f..0cbb1b8182a 100644 --- a/source/blender/blenkernel/intern/layer.cc +++ b/source/blender/blenkernel/intern/layer.cc @@ -2435,8 +2435,8 @@ void BKE_view_layer_blend_read_data(BlendDataReader *reader, ViewLayer *view_lay } void BKE_view_layer_blend_read_after_liblink(BlendLibReader * /*reader*/, - ID * /*self_id*/, - ViewLayer *view_layer) + ID * /*self_id*/, + ViewLayer *view_layer) { LISTBASE_FOREACH_MUTABLE (Base *, base, &view_layer->object_bases) { if (base->object == nullptr) { diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index f623a30f728..815a1844a9c 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/source/blender/blenkernel/intern/particle.cc @@ -5429,9 +5429,9 @@ void BKE_particle_system_blend_read_data(BlendDataReader *reader, ListBase *part } void BKE_particle_system_blend_read_after_liblink(BlendLibReader * /*reader*/, - Object *ob, - ID * /*id*/, - ListBase *particles) + Object *ob, + ID * /*id*/, + ListBase *particles) { LISTBASE_FOREACH_MUTABLE (ParticleSystem *, psys, particles) { if (psys->part) { diff --git a/source/blender/editors/space_buttons/space_buttons.cc b/source/blender/editors/space_buttons/space_buttons.cc index 3dc659b1dfa..1304c113674 100644 --- a/source/blender/editors/space_buttons/space_buttons.cc +++ b/source/blender/editors/space_buttons/space_buttons.cc @@ -946,8 +946,8 @@ static void buttons_space_blend_read_data(BlendDataReader * /*reader*/, SpaceLin } static void buttons_space_blend_read_after_liblink(BlendLibReader * /*reader*/, - ID * /*parent_id*/, - SpaceLink *sl) + ID * /*parent_id*/, + SpaceLink *sl) { SpaceProperties *sbuts = reinterpret_cast(sl); diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc index 4e067cd41c5..9de9706fa0f 100644 --- a/source/blender/editors/space_file/space_file.cc +++ b/source/blender/editors/space_file/space_file.cc @@ -884,8 +884,8 @@ static void file_space_blend_read_data(BlendDataReader *reader, SpaceLink *sl) } static void file_space_blend_read_after_liblink(BlendLibReader * /*reader*/, - ID * /*parent_id*/, - SpaceLink *sl) + ID * /*parent_id*/, + SpaceLink *sl) { SpaceFile *sfile = reinterpret_cast(sl); diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 6b970a7add1..5c7be0cffdc 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -377,11 +377,8 @@ void NODE_OT_add_group(wmOperatorType *ot) WM_operator_properties_id_lookup(ot, true); - PropertyRNA *prop = RNA_def_boolean(ot->srna, - "show_datablock_in_node", - true, - "Show the datablock selector in the node", - ""); + PropertyRNA *prop = RNA_def_boolean( + ot->srna, "show_datablock_in_node", true, "Show the datablock selector in the node", ""); RNA_def_property_flag(prop, (PropertyFlag)(PROP_SKIP_SAVE | PROP_HIDDEN)); } diff --git a/source/blender/editors/space_outliner/space_outliner.cc b/source/blender/editors/space_outliner/space_outliner.cc index d677a698e7c..71a875758da 100644 --- a/source/blender/editors/space_outliner/space_outliner.cc +++ b/source/blender/editors/space_outliner/space_outliner.cc @@ -514,8 +514,8 @@ static void outliner_space_blend_read_data(BlendDataReader *reader, SpaceLink *s } static void outliner_space_blend_read_after_liblink(BlendLibReader * /*reader*/, - ID * /*parent_id*/, - SpaceLink *sl) + ID * /*parent_id*/, + SpaceLink *sl) { SpaceOutliner *space_outliner = reinterpret_cast(sl); diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc index 9ee01a9feef..ecd17cce627 100644 --- a/source/blender/editors/space_script/space_script.cc +++ b/source/blender/editors/space_script/space_script.cc @@ -155,8 +155,8 @@ static void script_foreach_id(SpaceLink *space_link, LibraryForeachIDData *data) } static void script_space_blend_read_after_liblink(BlendLibReader * /*reader*/, - ID * /*parent_id*/, - SpaceLink *sl) + ID * /*parent_id*/, + SpaceLink *sl) { SpaceScript *scpt = reinterpret_cast(sl);