diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-03-22 06:38:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-22 06:38:45 +0300 |
commit | dfbaf967532cb4a20b348e7fb2947dbae13917e5 (patch) | |
tree | 81f556703f0579af198cd5ee6c60f96a2494fed0 /intern | |
parent | e6cf74515f0fd4a6887ca268746e008440a07d4a (diff) |
Revert "Disable clang-format for objective-C bits in GHOST."
This reverts commit 1cb9612d736f8513d7d4cfc01da6c4e386efcc4f.
We can now rely on the clang-format version as it's distributed
with pre-compiled binaries.
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, 0 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 9c28449a4e5..050c90097c5 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -357,7 +357,6 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) } } -/* clang-format off */ #pragma mark Cocoa objects /** @@ -500,8 +499,6 @@ 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 add7962d924..7998991dc8d 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -34,8 +34,6 @@ #include <sys/sysctl.h> -/* clang-format off */ - #pragma mark Cocoa window delegate object @interface CocoaWindowDelegate : NSObject <NSWindowDelegate> @@ -288,8 +286,6 @@ #pragma mark initialization / finalization -/* clang-format on */ - GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa, const char *title, GHOST_TInt32 left, |