diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-04-17 11:56:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-04-17 12:23:22 +0300 |
commit | 1cb9612d736f8513d7d4cfc01da6c4e386efcc4f (patch) | |
tree | 1748f3914e5085a3cc625a025e16148b97360576 /intern | |
parent | 8afb13019dd9b9096c5eb4854e73fa513f83c739 (diff) |
Disable clang-format for objective-C bits in GHOST.
Pre-8 versions of clang-format do not handle objective-C very well,
leading to unwanted changes when re-running the edits.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 4c9c7453f43..903fe4a6e8d 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -354,6 +354,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) } } +/* clang-format off */ #pragma mark Cocoa objects /** @@ -497,6 +498,8 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) #pragma mark initialization/finalization +/* clang-format on */ + GHOST_SystemCocoa::GHOST_SystemCocoa() { int mib[2]; diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 46343e17e46..a73c818297c 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -32,6 +32,8 @@ #include <sys/sysctl.h> +/* clang-format off */ + #pragma mark Cocoa window delegate object @interface CocoaWindowDelegate : NSObject <NSWindowDelegate> @@ -516,6 +518,8 @@ #pragma mark initialization / finalization +/* clang-format on */ + GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa, const STR_String &title, GHOST_TInt32 left, |