blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Stefan Werner 2019-09-14 09:26:51 +02:00
parent 2ec025d7be
commit ca76ecfa0e
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/ghost/intern/GHOST_ContextCGL.mm
View File

@ -34,7 +34,8 @@
static void ghost_fatal_error_dialog(const char *msg)
{
@autoreleasepool {
@autoreleasepool
{
NSString *message = [NSString stringWithFormat:@"Error opening window:\n%s", msg];
NSAlert *alert = [[NSAlert alloc] init];
@ -337,7 +338,8 @@ static const OSType METAL_CORE_VIDEO_PIXEL_FORMAT = kCVPixelFormatType_32BGRA;
void GHOST_ContextCGL::metalInit()
{
@autoreleasepool {
@autoreleasepool
{
id<MTLDevice> device = m_metalLayer.device;
// Create a command queue for blit/present operation
@ -532,7 +534,8 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
void GHOST_ContextCGL::metalSwapBuffers()
{
@autoreleasepool {
@autoreleasepool
{
updateDrawingContext();
glFlush();

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

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

2
intern/guardedalloc/intern/mallocn.c
View File

@ -72,7 +72,7 @@ void *aligned_malloc(size_t size, size_t alignment)
{
#ifdef _WIN32
return _aligned_malloc(size, alignment);
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__APPLE__)
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
void *result;
if (posix_memalign(&result, alignment, size)) {