Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton
2019-10-07 15:17:44 +11:00
parent 805ba9fc81
commit 60f0a94ab2
8 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -1383,8 +1383,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr)
// Check open windows if some changes are not saved // Check open windows if some changes are not saved
if (m_windowManager->getAnyModifiedState()) { if (m_windowManager->getAnyModifiedState()) {
@autoreleasepool @autoreleasepool {
{
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
NSString *title = [NSString stringWithFormat:@"Opening %@", [filepath lastPathComponent]]; NSString *title = [NSString stringWithFormat:@"Opening %@", [filepath lastPathComponent]];
NSString *text = @"Current document has not been saved.\nDo you really want to proceed?"; NSString *text = @"Current document has not been saved.\nDo you really want to proceed?";

1
source/blender/blenkernel/BKE_brush.h
View File

@@ -31,7 +31,6 @@ struct Main;
struct Scene; struct Scene;
struct ToolSettings; struct ToolSettings;
struct UnifiedPaintSettings; struct UnifiedPaintSettings;
struct bContext;
// enum eCurveMappingPreset; // enum eCurveMappingPreset;

5
source/blender/editors/interface/interface_widgets.c
View File

@@ -4911,8 +4911,9 @@ static void ui_draw_popover_back_impl(const uiWidgetColors *wcol,
{ {
/* tsk, this isn't nice. */ /* tsk, this isn't nice. */
const float unit_half = unit_size / 2; const float unit_half = unit_size / 2;
const float cent_x = mval_origin ? const float cent_x = mval_origin ? CLAMPIS(mval_origin[0],
CLAMPIS(mval_origin[0], rect->xmin + unit_size, rect->xmax - unit_size) : rect->xmin + unit_size,
rect->xmax - unit_size) :
BLI_rcti_cent_x(rect); BLI_rcti_cent_x(rect);
rect->ymax -= unit_half; rect->ymax -= unit_half;
rect->ymin += unit_half; rect->ymin += unit_half;

2
source/blender/editors/sculpt_paint/paint_intern.h
View File

@@ -29,7 +29,6 @@ struct Brush;
struct ColorManagedDisplay; struct ColorManagedDisplay;
struct ColorSpace; struct ColorSpace;
struct ImagePool; struct ImagePool;
struct ListBase;
struct MTex; struct MTex;
struct Object; struct Object;
struct Paint; struct Paint;
@@ -37,7 +36,6 @@ struct PaintStroke;
struct PointerRNA; struct PointerRNA;
struct RegionView3D; struct RegionView3D;
struct Scene; struct Scene;
struct UndoStep;
struct VPaint; struct VPaint;
struct ViewContext; struct ViewContext;
struct bContext; struct bContext;

3
source/blender/editors/transform/transform_generics.c
View File

@@ -1708,7 +1708,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
} }
else { else {
/* Release confirms preference should not affect node editor (T69288, T70504). */ /* 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 */ /* Global "release confirm" on mouse bindings */
t->flag |= T_RELEASE_CONFIRM; t->flag |= T_RELEASE_CONFIRM;
} }

2
source/blender/windowmanager/CMakeLists.txt
View File

@@ -68,8 +68,8 @@ set(SRC
intern/wm_operator_type.c intern/wm_operator_type.c
intern/wm_operators.c intern/wm_operators.c
intern/wm_panel_type.c intern/wm_panel_type.c
intern/wm_playanim.c
intern/wm_platform_support.c intern/wm_platform_support.c
intern/wm_playanim.c
intern/wm_splash_screen.c intern/wm_splash_screen.c
intern/wm_stereo.c intern/wm_stereo.c
intern/wm_subwindow.c intern/wm_subwindow.c