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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-10-07 07:17:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-07 07:22:22 +0300
commit60f0a94ab21c0120c091b3c0369dfff8fa9e2ca8 (patch)
treee55cb6105d5e05c2644b37d500a9a5e8d93a95f1
parent805ba9fc81d5b30596da52862b02e5ec8cabbad5 (diff)
Cleanup: clang-format
-rw-r--r--intern/ghost/intern/GHOST_SystemCocoa.mm3
-rw-r--r--source/blender/blenkernel/BKE_brush.h1
-rw-r--r--source/blender/editors/interface/interface_widgets.c7
-rw-r--r--source/blender/editors/sculpt_paint/paint_intern.h2
-rw-r--r--source/blender/editors/space_node/node_group.c4
-rw-r--r--source/blender/editors/transform/transform_generics.c3
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_geometry.c20
-rw-r--r--source/blender/windowmanager/CMakeLists.txt2
8 files changed, 20 insertions, 22 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 5902abf8382..68bac7d153b 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1383,8 +1383,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr)
// Check open windows if some changes are not saved
if (m_windowManager->getAnyModifiedState()) {
- @autoreleasepool
- {
+ @autoreleasepool {
NSAlert *alert = [[NSAlert alloc] init];
NSString *title = [NSString stringWithFormat:@"Opening %@", [filepath lastPathComponent]];
NSString *text = @"Current document has not been saved.\nDo you really want to proceed?";
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index 891247f8127..70741831727 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -31,7 +31,6 @@ struct Main;
struct Scene;
struct ToolSettings;
struct UnifiedPaintSettings;
-struct bContext;
// enum eCurveMappingPreset;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index ce73e4de45c..b3e039292e1 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4911,9 +4911,10 @@ static void ui_draw_popover_back_impl(const uiWidgetColors *wcol,
{
/* tsk, this isn't nice. */
const float unit_half = unit_size / 2;
- const float cent_x = mval_origin ?
- CLAMPIS(mval_origin[0], rect->xmin + unit_size, rect->xmax - unit_size) :
- BLI_rcti_cent_x(rect);
+ const float cent_x = mval_origin ? CLAMPIS(mval_origin[0],
+ rect->xmin + unit_size,
+ rect->xmax - unit_size) :
+ BLI_rcti_cent_x(rect);
rect->ymax -= unit_half;
rect->ymin += unit_half;
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 69eed84fe2b..19380fb9022 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -29,7 +29,6 @@ struct Brush;
struct ColorManagedDisplay;
struct ColorSpace;
struct ImagePool;
-struct ListBase;
struct MTex;
struct Object;
struct Paint;
@@ -37,7 +36,6 @@ struct PaintStroke;
struct PointerRNA;
struct RegionView3D;
struct Scene;
-struct UndoStep;
struct VPaint;
struct ViewContext;
struct bContext;
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index 681d1e46f71..5d020ff5ab4 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -891,7 +891,7 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree,
}
}
if (sock->flag & (SOCK_HIDDEN | SOCK_UNAVAIL)) {
- skip = true;
+ skip = true;
}
if (skip) {
continue;
@@ -915,7 +915,7 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree,
}
}
if (sock->flag & (SOCK_HIDDEN | SOCK_UNAVAIL)) {
- skip = true;
+ skip = true;
}
if (skip) {
continue;
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 2dae16da4c3..7ff25509347 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1708,7 +1708,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
}
else {
/* Release confirms preference should not affect node editor (T69288, T70504). */
- if (ISMOUSE(t->launch_event) && ((U.flag & USER_RELEASECONFIRM) || (t->spacetype == SPACE_NODE))) {
+ if (ISMOUSE(t->launch_event) &&
+ ((U.flag & USER_RELEASECONFIRM) || (t->spacetype == SPACE_NODE))) {
/* Global "release confirm" on mouse bindings */
t->flag |= T_RELEASE_CONFIRM;
}
diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.c b/source/blender/nodes/shader/nodes/node_shader_geometry.c
index e22bbf90a94..54a5411114a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geometry.c
+++ b/source/blender/nodes/shader/nodes/node_shader_geometry.c
@@ -48,16 +48,16 @@ static int node_shader_gpu_geometry(GPUMaterial *mat,
GPUNodeLink *orco_link = (!out[2].hasoutput) ? GPU_constant(val) : GPU_attribute(CD_ORCO, "");
const bool success = GPU_stack_link(mat,
- node,
- "node_geometry",
- in,
- out,
- GPU_builtin(GPU_VIEW_POSITION),
- GPU_builtin(GPU_WORLD_NORMAL),
- orco_link,
- GPU_builtin(GPU_OBJECT_MATRIX),
- GPU_builtin(GPU_INVERSE_VIEW_MATRIX),
- bary_link);
+ node,
+ "node_geometry",
+ in,
+ out,
+ GPU_builtin(GPU_VIEW_POSITION),
+ GPU_builtin(GPU_WORLD_NORMAL),
+ orco_link,
+ GPU_builtin(GPU_OBJECT_MATRIX),
+ GPU_builtin(GPU_INVERSE_VIEW_MATRIX),
+ bary_link);
/* for each output */
for (int i = 0; sh_node_geometry_out[i].type != -1; i++) {
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index ebb9e1106d6..59f99a9ff88 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -68,8 +68,8 @@ set(SRC
intern/wm_operator_type.c
intern/wm_operators.c
intern/wm_panel_type.c
- intern/wm_playanim.c
intern/wm_platform_support.c
+ intern/wm_playanim.c
intern/wm_splash_screen.c
intern/wm_stereo.c
intern/wm_subwindow.c