Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2022-01-13 21:55:20 +0300
committerJulian Eisel <julian@blender.org>2022-01-13 21:56:11 +0300
commit1c4a1c13e04e51d00767fdb478a9957faae815e2 (patch)
tree3c3fe61cf864212d46d1b89d3b6d7a050e696d32 /source
parent5ecaa9a8385d45ce75c71dde1fc96d5312a769e1 (diff)
Cleanup: Run `make format`
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenlib/intern/noise.cc2
-rw-r--r--source/blender/compositor/nodes/COM_SceneTimeNode.cc4
-rw-r--r--source/blender/editors/screen/screen_ops.c2
-rw-r--r--source/blender/editors/space_outliner/outliner_collections.cc3
-rw-r--r--source/blender/editors/space_outliner/outliner_dragdrop.cc8
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.cc9
6 files changed, 19 insertions, 9 deletions
diff --git a/source/blender/blenlib/intern/noise.cc b/source/blender/blenlib/intern/noise.cc
index 3460c1284fc..21816fcd595 100644
--- a/source/blender/blenlib/intern/noise.cc
+++ b/source/blender/blenlib/intern/noise.cc
@@ -50,8 +50,8 @@
#include <cmath>
#include <cstdint>
-#include "BLI_math_vec_types.hh"
#include "BLI_math_base_safe.h"
+#include "BLI_math_vec_types.hh"
#include "BLI_noise.hh"
#include "BLI_utildefines.h"
diff --git a/source/blender/compositor/nodes/COM_SceneTimeNode.cc b/source/blender/compositor/nodes/COM_SceneTimeNode.cc
index f495db5ed4c..533f30918ca 100644
--- a/source/blender/compositor/nodes/COM_SceneTimeNode.cc
+++ b/source/blender/compositor/nodes/COM_SceneTimeNode.cc
@@ -28,13 +28,13 @@ SceneTimeNode::SceneTimeNode(bNode *editor_node) : Node(editor_node)
}
void SceneTimeNode::convert_to_operations(NodeConverter &converter,
- const CompositorContext &context) const
+ const CompositorContext &context) const
{
SetValueOperation *SecondOperation = new SetValueOperation();
SetValueOperation *frameOperation = new SetValueOperation();
const int frameNumber = context.get_framenumber();
- const Scene* scene = context.get_scene();
+ const Scene *scene = context.get_scene();
const double frameRate = (((double)scene->r.frs_sec) / (double)scene->r.frs_sec_base);
SecondOperation->set_value(float(frameNumber / frameRate));
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) {