From 664b31ea7348a99aa76389fec6e59a3e80e0a6df Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 18 Apr 2023 09:45:01 +0200 Subject: [PATCH] Cleanup: make format --- intern/ghost/intern/GHOST_SystemCocoa.mm | 13 +++++++------ source/blender/blenloader/intern/readfile.cc | 6 ++---- .../blender/editors/sculpt_paint/sculpt_detail.cc | 3 ++- .../editors/sculpt_paint/sculpt_filter_color.cc | 12 ++++++++++-- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 5a6f916e1dd..4ea6a513d03 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -900,12 +900,13 @@ GHOST_TSuccess GHOST_SystemCocoa::getButtons(GHOST_Buttons &buttons) const GHOST_TCapabilityFlag GHOST_SystemCocoa::getCapabilities() const { - return GHOST_TCapabilityFlag(GHOST_CAPABILITY_FLAG_ALL & - ~( - /* Cocoa has no support for a primary selection clipboard. */ - GHOST_kCapabilityPrimaryClipboard | - /* This Cocoa back-end has not yet implemented image copy/paste. */ - GHOST_kCapabilityClipboardImages)); + return GHOST_TCapabilityFlag( + GHOST_CAPABILITY_FLAG_ALL & + ~( + /* Cocoa has no support for a primary selection clipboard. */ + GHOST_kCapabilityPrimaryClipboard | + /* This Cocoa back-end has not yet implemented image copy/paste. */ + GHOST_kCapabilityClipboardImages)); } #pragma mark Event handlers diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index 618f9182a5d..1f1c5a48758 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -3126,10 +3126,8 @@ static bool read_libblock_undo_restore( else if (id_type->flags & IDTYPE_FLAGS_NO_MEMFILE_UNDO) { /* Skip reading any 'no undo' datablocks (typically UI-like ones), existing ones are kept. * See `setup_app_data` for details. */ - CLOG_INFO(&LOG_UNDO, - 2, - "UNDO: skip restore datablock %s, 'NO_MEMFILE_UNDO' type of ID", - id->name); + CLOG_INFO( + &LOG_UNDO, 2, "UNDO: skip restore datablock %s, 'NO_MEMFILE_UNDO' type of ID", id->name); return true; } else if (bhead->code == ID_LINK_PLACEHOLDER) { diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index 0104e7e1b63..1fb308850d8 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -746,7 +746,8 @@ static int dyntopo_detail_size_edit_invoke(bContext *C, wmOperator *op, const wm ss->draw_faded_cursor = true; const char *status_str = TIP_( - "Move the mouse to change the dyntopo detail size. LMB: confirm size, ESC/RMB: cancel, SHIFT: precision mode, CTRL: sample detail size"); + "Move the mouse to change the dyntopo detail size. LMB: confirm size, ESC/RMB: cancel, " + "SHIFT: precision mode, CTRL: sample detail size"); ED_workspace_status_text(C, status_str); return OPERATOR_RUNNING_MODAL; diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc index b080377bc23..13aa2f51232 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc @@ -470,7 +470,15 @@ void SCULPT_OT_color_filter(wmOperatorType *ot) RNA_def_enum(ot->srna, "type", prop_color_filter_types, COLOR_FILTER_FILL, "Filter Type", ""); - PropertyRNA *prop = RNA_def_float_color( - ot->srna, "fill_color", 3, fill_filter_default_color, 0.0f, FLT_MAX, "Fill Color", "", 0.0f, 1.0f); + PropertyRNA *prop = RNA_def_float_color(ot->srna, + "fill_color", + 3, + fill_filter_default_color, + 0.0f, + FLT_MAX, + "Fill Color", + "", + 0.0f, + 1.0f); RNA_def_property_subtype(prop, PROP_COLOR_GAMMA); }