diff options
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 9 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 5 |
5 files changed, 13 insertions, 14 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index c506f98d6fe..70933bd668e 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -961,9 +961,9 @@ GHOST_EventButton *GHOST_SystemWin32::processButtonEvent(GHOST_TEventType type, } GHOST_TSuccess GHOST_SystemWin32::processWintabEvent(GHOST_TEventType type, - GHOST_WindowWin32 *window, - GHOST_TButtonMask mask, - bool mousePressed) + GHOST_WindowWin32 *window, + GHOST_TButtonMask mask, + bool mousePressed) { GHOST_SystemWin32 *system = (GHOST_SystemWin32 *)getSystem(); @@ -1169,7 +1169,8 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind return NULL; } - /* If using Wintab but no button event is currently active, fall through to default handling. */ + /* If using Wintab but no button event is currently active, + * fall through to default handling. */ } system->getCursorPosition(x_screen, y_screen); diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 51a9dbae238..3b9da4d17d9 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -329,9 +329,9 @@ class GHOST_SystemWin32 : public GHOST_System { * \return True if the method handled the event. */ static GHOST_TSuccess processWintabEvent(GHOST_TEventType type, - GHOST_WindowWin32 *window, - GHOST_TButtonMask mask, - bool mousePressed); + GHOST_WindowWin32 *window, + GHOST_TButtonMask mask, + bool mousePressed); /** * Creates tablet events from pointer events. diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index aacc0070e5a..bce0d2dca5b 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -34,8 +34,8 @@ # include "GHOST_ImeWin32.h" #endif -#include <vector> #include <queue> +#include <vector> #include <wintab.h> // PACKETDATA and PACKETMODE modify structs in pktdef.h, so make sure they come first diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 823ab525ab2..96d34dd6145 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -999,8 +999,9 @@ static void sculpt_gesture_trim_normals_update(SculptGestureContext *sgcontext) /* Get the origin and normal that are going to be used for calculating the depth and position the * trimming geometry. */ -static void sculpt_gesture_trim_shape_origin_normal_get( - SculptGestureContext *sgcontext, float *r_origin, float *r_normal) +static void sculpt_gesture_trim_shape_origin_normal_get(SculptGestureContext *sgcontext, + float *r_origin, + float *r_normal) { SculptGestureTrimOperation *trim_operation = (SculptGestureTrimOperation *)sgcontext->operation; /* Use the view origin and normal in world space. The trimming mesh coordinates are diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 0a60d993c37..19e4adde19c 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -3265,10 +3265,7 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C, /* Modified Images Checkbox. */ if (modified_images_count > 0) { char message[64]; - BLI_snprintf(message, - sizeof(message), - "Save %u modified image(s)", - modified_images_count); + BLI_snprintf(message, sizeof(message), "Save %u modified image(s)", modified_images_count); uiItemS(layout); uiDefButBitC(block, UI_BTYPE_CHECKBOX, |