From 1c4a1c13e04e51d00767fdb478a9957faae815e2 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Thu, 13 Jan 2022 19:55:20 +0100 Subject: Cleanup: Run `make format` --- source/blender/editors/screen/screen_ops.c | 2 +- source/blender/editors/space_outliner/outliner_collections.cc | 3 ++- source/blender/editors/space_outliner/outliner_dragdrop.cc | 8 ++++++-- source/blender/editors/space_outliner/outliner_draw.cc | 9 +++++++-- 4 files changed, 16 insertions(+), 6 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 757b1a4c0c4..6581bffb6bd 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2091,7 +2091,7 @@ static bool area_split_allowed(const ScrArea *area, const eScreenAxis dir_axis) } if ((dir_axis == SCREEN_AXIS_V && area->winx <= 2 * AREAMINX) || - (dir_axis == SCREEN_AXIS_H && area->winy <= 2 * ED_area_headersize())) { + (dir_axis == SCREEN_AXIS_H && area->winy <= 2 * ED_area_headersize())) { /* Must be at least double minimum sizes to split into two. */ return false; } diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index 472ddef52c2..9fc841fcba9 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -125,7 +125,8 @@ TreeTraversalAction outliner_find_selected_objects(TreeElement *te, void *custom return TRAVERSE_CONTINUE; } - if ((tselem->type != TSE_SOME_ID) || (tselem->id == nullptr) || (GS(tselem->id->name) != ID_OB)) { + if ((tselem->type != TSE_SOME_ID) || (tselem->id == nullptr) || + (GS(tselem->id->name) != ID_OB)) { return TRAVERSE_SKIP_CHILDS; } diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc index f6256b74bcb..30f1ef911e4 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.cc +++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc @@ -1540,8 +1540,12 @@ void outliner_dropboxes(void) WM_dropbox_add(lb, "OUTLINER_OT_parent_clear", parent_clear_poll, nullptr, nullptr, nullptr); WM_dropbox_add(lb, "OUTLINER_OT_scene_drop", scene_drop_poll, nullptr, nullptr, nullptr); WM_dropbox_add(lb, "OUTLINER_OT_material_drop", material_drop_poll, nullptr, nullptr, nullptr); - WM_dropbox_add( - lb, "OUTLINER_OT_datastack_drop", datastack_drop_poll, nullptr, nullptr, datastack_drop_tooltip); + WM_dropbox_add(lb, + "OUTLINER_OT_datastack_drop", + datastack_drop_poll, + nullptr, + nullptr, + datastack_drop_tooltip); WM_dropbox_add(lb, "OUTLINER_OT_collection_drop", collection_drop_poll, diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index d0453de87e9..9c522effa5e 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -527,8 +527,13 @@ void outliner_collection_isolate_flag(Scene *scene, is_hide); /* Make this collection and its children collections the only "visible". */ - outliner_collection_set_flag_recursive( - scene, view_layer, layer_collection, collection, layer_or_collection_prop, nullptr, !is_hide); + outliner_collection_set_flag_recursive(scene, + view_layer, + layer_collection, + collection, + layer_or_collection_prop, + nullptr, + !is_hide); /* Make this collection direct parents also "visible". */ if (layer_collection) { -- cgit v1.2.3