diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 07:03:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 07:08:16 +0300 |
commit | 5ef4b0438cf4773e7dd8c661388bb2c3079869bf (patch) | |
tree | 634b95c85cdc786d48904b3ee3bb47f77eaff262 | |
parent | 7e6263095de1ded7b17ed9c4d030d1b9dac6d9ed (diff) |
Cleanup: trailing space
-rw-r--r-- | intern/cycles/device/opencl/opencl.h | 4 | ||||
-rw-r--r-- | intern/cycles/device/opencl/opencl_split.cpp | 10 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_ContextCGL.mm | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_DisplayManagerCocoa.mm | 32 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 30 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemPathsCocoa.mm | 26 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 166 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_brush.c | 2 |
12 files changed, 142 insertions, 142 deletions
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h index a8ad4a935f7..89761293638 100644 --- a/intern/cycles/device/opencl/opencl.h +++ b/intern/cycles/device/opencl/opencl.h @@ -296,9 +296,9 @@ public: const string& get_log() const { return log; } void report_error(); - /* Wait until this kernel is available to be used + /* Wait until this kernel is available to be used * It will return true when the kernel is available. - * It will return false when the kernel is not available + * It will return false when the kernel is not available * or could not be loaded. */ bool wait_for_availability(); diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index fd7eebf0221..489d10b7087 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -396,8 +396,8 @@ public: OpenCLDevice::OpenCLProgram(device, program_name, device->get_opencl_program_filename(kernel_name), - device->get_build_options(requested_features, - program_name, + device->get_build_options(requested_features, + program_name, device->use_preview_kernels)); kernel->program.add_kernel(ustring("path_trace_" + kernel_name)); @@ -770,7 +770,7 @@ bool OpenCLDevice::load_kernels(const DeviceRequestedFeatures& requested_feature /* Verify we have right opencl version. */ if(!opencl_version_check()) return false; - + load_required_kernels(requested_features); vector<OpenCLProgram*> programs; @@ -880,7 +880,7 @@ DeviceKernelStatus OpenCLDevice::get_active_kernel_switch_state() { /* Do not switch kernels for background renderings * We do foreground rendering but use the preview kernels - * Check for the optimized kernels + * Check for the optimized kernels * * This works also the other way around, where we are using * optimized kernels but new ones are being compiled due @@ -891,7 +891,7 @@ DeviceKernelStatus OpenCLDevice::get_active_kernel_switch_state() * this as an early exit */ return DEVICE_KERNEL_USING_FEATURE_KERNEL; } - + bool other_kernels_finished = load_kernel_task_pool.finished(); if (use_preview_kernels) { if (other_kernels_finished) { diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index dc0a5089d74..913ba459e9a 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -191,7 +191,7 @@ GHOST_TSuccess GHOST_ContextCGL::updateDrawingContext() static void makeAttribList( std::vector<NSOpenGLPixelFormatAttribute>& attribs, - bool coreProfile, + bool coreProfile, bool stereoVisual, int numOfAASamples, bool needAlpha, @@ -202,7 +202,7 @@ static void makeAttribList( attribs.push_back(NSOpenGLPFAOpenGLProfile); attribs.push_back(coreProfile ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy); - + // Pixel Format Attributes for the windowed NSOpenGLContext attribs.push_back(NSOpenGLPFADoubleBuffer); @@ -375,7 +375,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext() if (s_sharedCount == 0) s_sharedOpenGLContext = m_openGLContext; - + s_sharedCount++; diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index 0cfa6096390..74508e1345a 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -34,9 +34,9 @@ GHOST_DisplayManagerCocoa::GHOST_DisplayManagerCocoa(void) GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplays(GHOST_TUns8& numDisplays) const { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + numDisplays = (GHOST_TUns8) [[NSScreen screens] count]; - + [pool drain]; return GHOST_kSuccess; } @@ -45,7 +45,7 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplays(GHOST_TUns8& numDisplay GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const { numSettings = (GHOST_TInt32)3; //Width, Height, BitsPerPixel - + return GHOST_kSuccess; } @@ -53,27 +53,27 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplaySettings(GHOST_TUns8 disp GHOST_TSuccess GHOST_DisplayManagerCocoa::getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const { NSScreen *askedDisplay; - + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + if (display == kMainDisplay) //Screen #0 may not be the main one askedDisplay = [NSScreen mainScreen]; else askedDisplay = [[NSScreen screens] objectAtIndex:display]; - + if (askedDisplay == nil) { [pool drain]; return GHOST_kFailure; } - + NSRect frame = [askedDisplay visibleFrame]; setting.xPixels = frame.size.width; setting.yPixels = frame.size.height; - + setting.bpp = NSBitsPerPixelFromDepth([askedDisplay depth]); - + setting.frequency = 0; //No more CRT display... - + #ifdef GHOST_DEBUG printf("display mode: width=%d, height=%d, bpp=%d, frequency=%d\n", setting.xPixels, setting.yPixels, setting.bpp, setting.frequency); #endif // GHOST_DEBUG @@ -86,7 +86,7 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getDisplaySetting(GHOST_TUns8 display, GHOST_TSuccess GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const { NSScreen *askedDisplay; - + GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(): only main display is supported"); NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -95,18 +95,18 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(GHOST_TUns8 d askedDisplay = [NSScreen mainScreen]; else askedDisplay = [[NSScreen screens] objectAtIndex:display]; - + if (askedDisplay == nil) { [pool drain]; return GHOST_kFailure; } - + NSRect frame = [askedDisplay visibleFrame]; setting.xPixels = frame.size.width; setting.yPixels = frame.size.height; - + setting.bpp = NSBitsPerPixelFromDepth([askedDisplay depth]); - + setting.frequency = 0; //No more CRT display... #ifdef GHOST_DEBUG @@ -131,7 +131,7 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::setCurrentDisplaySetting(GHOST_TUns8 d #endif // GHOST_DEBUG //Display configuration is no more available in 10.6 - + /* CFDictionaryRef displayModeValues = ::CGDisplayBestModeForParametersAndRefreshRate( m_displayIDs[display], (size_t)setting.bpp, diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index e8e0b24acdb..65d8b965d09 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm @@ -2,7 +2,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 52031e77cc7..916e219fa97 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -84,7 +84,7 @@ static GHOST_TButtonMask convertButton(int button) * \param recvChar the character ignoring modifiers (except for shift) * \return Ghost key code */ -static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction) +static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction) { //printf("\nrecvchar %c 0x%x",recvChar,recvChar); switch (rawCode) { @@ -226,7 +226,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction) if (uchrHandle) { UInt32 deadKeyState=0; UniCharCount actualStrLength=0; - + UCKeyTranslate((UCKeyboardLayout*)CFDataGetBytePtr(uchrHandle), rawCode, keyAction, 0, LMGetKbdType(), kUCKeyTranslateNoDeadKeysBit, &deadKeyState, 1, &actualStrLength, &recvChar); } @@ -540,7 +540,7 @@ GHOST_TSuccess GHOST_SystemCocoa::init() } [NSApp finishLaunching]; - + [pool drain]; } return success; @@ -598,7 +598,7 @@ void GHOST_SystemCocoa::getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns3 } GHOST_IWindow* GHOST_SystemCocoa::createWindow( - const STR_String& title, + const STR_String& title, GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, @@ -1021,7 +1021,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType droppedStr = [droppedArray objectAtIndex:i]; pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1); + temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1); if (!temp_buff) { strArray->count = i; @@ -1041,7 +1041,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType droppedStr = (NSString*)data; pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1); + temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1); if (temp_buff == NULL) { return GHOST_kFailure; @@ -1104,10 +1104,10 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType /* First get RGB values w/o Alpha to avoid pre-multiplication, 32bit but last byte is unused */ blBitmapFormatImageRGB = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL - pixelsWide:imgSize.width + pixelsWide:imgSize.width pixelsHigh:imgSize.height bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO - colorSpaceName:NSDeviceRGBColorSpace + colorSpaceName:NSDeviceRGBColorSpace bitmapFormat:(NSBitmapFormat)0 bytesPerRow:4*imgSize.width bitsPerPixel:32/*RGB format padded to 32bits*/]; @@ -1239,7 +1239,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr) if (!window) { return NO; - } + } //Discard event if we are in cursor grab sequence, it'll lead to "stuck cursor" situation if the alert panel is raised if (window && window->getCursorGrabModeIsWarp()) @@ -1263,7 +1263,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr) { filenameTextSize = [filepath lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - temp_buff = (char*) malloc(filenameTextSize+1); + temp_buff = (char*) malloc(filenameTextSize+1); if (temp_buff == NULL) { return GHOST_kFailure; @@ -1332,7 +1332,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleTabletEvent(void *eventPtr, short eventT ct.Active = GHOST_kTabletModeNone; } break; - + default: GHOST_ASSERT(FALSE,"GHOST_SystemCocoa::handleTabletEvent : unknown event received"); return GHOST_kFailure; @@ -1411,7 +1411,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) //Handle tablet events combined with mouse events handleTabletEvent(event); - case NSMouseMoved: + case NSMouseMoved: { GHOST_TGrabCursorMode grab_mode = window->getCursorGrabMode(); @@ -1661,9 +1661,9 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr) m_ignoreMomentumScroll = true; break; - case NSFlagsChanged: + case NSFlagsChanged: modifiers = [event modifierFlags]; - + if ((modifiers & NSShiftKeyMask) != (m_modifierMask & NSShiftKeyMask)) { pushEvent(new GHOST_EventKey([event timestamp] * 1000, (modifiers & NSShiftKeyMask) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp, window, GHOST_kKeyLeftShift)); } @@ -1725,7 +1725,7 @@ GHOST_TUns8* GHOST_SystemCocoa::getClipboard(bool selection) const pastedTextSize = [textPasted lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1); + temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1); if (temp_buff == NULL) { [pool drain]; diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm index 97e01973d69..fd6a66f3db3 100644 --- a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm @@ -2,7 +2,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,7 +16,7 @@ * The Original Code is Copyright (C) 2010 Blender Foundation. * All rights reserved. * - * + * */ #import <Foundation/Foundation.h> @@ -44,18 +44,18 @@ const GHOST_TUns8* GHOST_SystemPathsCocoa::getSystemDir(int, const char *version NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSString *basePath; NSArray *paths; - + paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSLocalDomainMask, YES); - + if ([paths count] > 0) basePath = [paths objectAtIndex:0]; - else { + else { [pool drain]; return NULL; } - + snprintf(tempPath, sizeof(tempPath), "%s/Blender/%s", [basePath cStringUsingEncoding:NSASCIIStringEncoding], versionstr); - + [pool drain]; return (GHOST_TUns8*)tempPath; } @@ -71,13 +71,13 @@ const GHOST_TUns8* GHOST_SystemPathsCocoa::getUserDir(int, const char *versionst if ([paths count] > 0) basePath = [paths objectAtIndex:0]; - else { + else { [pool drain]; return NULL; } snprintf(tempPath, sizeof(tempPath), "%s/Blender/%s", [basePath cStringUsingEncoding:NSASCIIStringEncoding], versionstr); - + [pool drain]; return (GHOST_TUns8*)tempPath; } @@ -87,16 +87,16 @@ const GHOST_TUns8* GHOST_SystemPathsCocoa::getBinaryDir() const static GHOST_TUns8 tempPath[512] = ""; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSString *basePath; - + basePath = [[NSBundle mainBundle] bundlePath]; - + if (basePath == nil) { [pool drain]; return NULL; } - + strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]); - + [pool drain]; return tempPath; } diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 9a7bed513db..1af39f11f08 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -48,7 +48,7 @@ - (void)windowDidResize:(NSNotification *)notification; - (void)windowDidMove:(NSNotification *)notification; - (void)windowWillMove:(NSNotification *)notification; -- (BOOL)windowShouldClose:(id)sender; +- (BOOL)windowShouldClose:(id)sender; - (void)windowDidChangeBackingProperties:(NSNotification *)notification; @end @@ -165,12 +165,12 @@ { NSPoint mouseLocation = [sender draggingLocation]; NSPasteboard *draggingPBoard = [sender draggingPasteboard]; - + if ([[draggingPBoard types] containsObject:NSTIFFPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeBitmap; else if ([[draggingPBoard types] containsObject:NSFilenamesPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeFilenames; else if ([[draggingPBoard types] containsObject:NSStringPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeString; else return NSDragOperationNone; - + associatedWindow->setAcceptDragOperation(TRUE); //Drag operation is accepted by default systemCocoa->handleDraggingEvent(GHOST_kEventDraggingEntered, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil); return NSDragOperationCopy; @@ -184,7 +184,7 @@ - (NSDragOperation)draggingUpdated:(id < NSDraggingInfo >)sender { NSPoint mouseLocation = [sender draggingLocation]; - + systemCocoa->handleDraggingEvent(GHOST_kEventDraggingUpdated, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil); return associatedWindow->canAcceptDragOperation() ? NSDragOperationCopy : NSDragOperationNone; } @@ -209,7 +209,7 @@ NSPasteboard *draggingPBoard = [sender draggingPasteboard]; NSImage *droppedImg; id data; - + switch (m_draggedObjectType) { case GHOST_kDragnDropTypeBitmap: if ([NSImage canInitWithPasteboard:draggingPBoard]) { @@ -512,16 +512,16 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( m_immediateDraw = false; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + //Creates the window NSRect rect; NSSize minSize; - + rect.origin.x = left; rect.origin.y = bottom; rect.size.width = width; rect.size.height = height; - + m_window = [[CocoaWindow alloc] initWithContentRect:rect styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask backing:NSBackingStoreBuffered defer:NO]; @@ -530,14 +530,14 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( [pool drain]; return; } - + [m_window setSystemAndWindowCocoa:systemCocoa windowCocoa:this]; - + //Forbid to resize the window below the blender defined minimum one minSize.width = 320; minSize.height = 240; [m_window setContentMinSize:minSize]; - + //Creates the OpenGL View inside the window m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect]; @@ -550,36 +550,36 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( } [m_openGLView setSystemAndWindowCocoa:systemCocoa windowCocoa:this]; - + [m_window setContentView:m_openGLView]; [m_window setInitialFirstResponder:m_openGLView]; - + [m_window makeKeyAndOrderFront:nil]; - + setDrawingContextType(type); updateDrawingContext(); activateDrawingContext(); setTitle(title); - + m_tablet.Active = GHOST_kTabletModeNone; - + CocoaWindowDelegate *windowDelegate = [[CocoaWindowDelegate alloc] init]; [windowDelegate setSystemAndWindowCocoa:systemCocoa windowCocoa:this]; [m_window setDelegate:windowDelegate]; - + [m_window setAcceptsMouseMovedEvents:YES]; - + NSView *view = [m_window contentView]; [view setAcceptsTouchEvents:YES]; - + [m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, NSStringPboardType, NSTIFFPboardType, nil]]; - + if (state != GHOST_kWindowStateFullScreen) { [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; } - + if (state == GHOST_kWindowStateFullScreen) setState(GHOST_kWindowStateFullScreen); @@ -601,11 +601,11 @@ GHOST_WindowCocoa::~GHOST_WindowCocoa() releaseNativeHandles(); [m_openGLView release]; - + if (m_window) { [m_window close]; } - + // Check for other blender opened windows and make the frontmost key // Note: for some reason the closed window is still in the list NSArray *windowsList = [NSApp orderedWindows]; @@ -638,16 +638,16 @@ void GHOST_WindowCocoa::setTitle(const STR_String& title) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSString *windowTitle = [[NSString alloc] initWithCString:title encoding:NSUTF8StringEncoding]; - + //Set associated file if applicable if (windowTitle && [windowTitle hasPrefix:@"Blender"]) { NSRange fileStrRange; NSString *associatedFileName; int len; - + fileStrRange.location = [windowTitle rangeOfString:@"["].location+1; len = [windowTitle rangeOfString:@"]"].location - fileStrRange.location; - + if (len > 0) { fileStrRange.length = len; associatedFileName = [windowTitle substringWithRange:fileStrRange]; @@ -673,7 +673,7 @@ void GHOST_WindowCocoa::setTitle(const STR_String& title) [m_window setRepresentedFilename:@""]; } - + [windowTitle release]; [pool drain]; } @@ -690,7 +690,7 @@ void GHOST_WindowCocoa::getTitle(STR_String& title) const if (windowTitle != nil) { title = [windowTitle UTF8String]; } - + [pool drain]; } @@ -701,7 +701,7 @@ void GHOST_WindowCocoa::getWindowBounds(GHOST_Rect& bounds) const GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::getWindowBounds(): window invalid"); NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + NSRect screenSize = [[m_window screen] visibleFrame]; rect = [m_window frame]; @@ -710,7 +710,7 @@ void GHOST_WindowCocoa::getWindowBounds(GHOST_Rect& bounds) const bounds.m_l = rect.origin.x -screenSize.origin.x; bounds.m_r = rect.origin.x-screenSize.origin.x + rect.size.width; bounds.m_t = screenSize.size.height - (rect.origin.y + rect.size.height -screenSize.origin.y); - + [pool drain]; } @@ -719,9 +719,9 @@ void GHOST_WindowCocoa::getClientBounds(GHOST_Rect& bounds) const { NSRect rect; GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::getClientBounds(): window invalid"); - + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + NSRect screenSize = [[m_window screen] visibleFrame]; //Max window contents as screen size (excluding title bar...) @@ -729,7 +729,7 @@ void GHOST_WindowCocoa::getClientBounds(GHOST_Rect& bounds) const styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)]; rect = [m_window contentRectForFrameRect:[m_window frame]]; - + bounds.m_b = contentRect.size.height - (rect.origin.y -contentRect.origin.y); bounds.m_l = rect.origin.x -contentRect.origin.x; bounds.m_r = rect.origin.x-contentRect.origin.x + rect.size.width; @@ -856,12 +856,12 @@ void GHOST_WindowCocoa::screenToClientIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, { NSRect screenCoord; NSRect baseCoord; - + screenCoord.origin.x = inX; screenCoord.origin.y = inY; - + baseCoord = [m_window convertRectFromScreen:screenCoord]; - + outX = baseCoord.origin.x; outY = baseCoord.origin.y; } @@ -870,12 +870,12 @@ void GHOST_WindowCocoa::clientToScreenIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, { NSRect screenCoord; NSRect baseCoord; - + baseCoord.origin.x = inX; baseCoord.origin.y = inY; - + screenCoord = [m_window convertRectToScreen:baseCoord]; - + outX = screenCoord.origin.x; outY = screenCoord.origin.y; } @@ -890,7 +890,7 @@ NSScreen* GHOST_WindowCocoa::getScreen() void GHOST_WindowCocoa::setNativePixelSize(void) { NSRect backingBounds = [m_openGLView convertRectToBacking:[m_openGLView bounds]]; - + GHOST_Rect rect; getClientBounds(rect); @@ -914,7 +914,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state) case GHOST_kWindowStateMaximized: [m_window zoom:nil]; break; - + case GHOST_kWindowStateFullScreen: { NSUInteger masks = [m_window styleMask]; @@ -947,9 +947,9 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state) GHOST_TSuccess GHOST_WindowCocoa::setModifiedState(bool isUnsavedChanges) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + [m_window setDocumentEdited:isUnsavedChanges]; - + [pool drain]; return GHOST_Window::setModifiedState(isUnsavedChanges); } @@ -959,23 +959,23 @@ GHOST_TSuccess GHOST_WindowCocoa::setModifiedState(bool isUnsavedChanges) GHOST_TSuccess GHOST_WindowCocoa::setOrder(GHOST_TWindowOrder order) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setOrder(): window invalid"); if (order == GHOST_kWindowOrderTop) { [m_window makeKeyAndOrderFront:nil]; } else { NSArray *windowsList; - + [m_window orderBack:nil]; - + //Check for other blender opened windows and make the frontmost key windowsList = [NSApp orderedWindows]; if ([windowsList count]) { [[windowsList objectAtIndex:0] makeKeyAndOrderFront:nil]; } } - + [pool drain]; return GHOST_kSuccess; } @@ -1027,10 +1027,10 @@ GHOST_TSuccess GHOST_WindowCocoa::invalidate() GHOST_TSuccess GHOST_WindowCocoa::setProgressBar(float progress) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + if ((progress >=0.0) && (progress <=1.0)) { NSImage* dockIcon = [[NSImage alloc] initWithSize:NSMakeSize(128,128)]; - + [dockIcon lockFocus]; NSRect progressBox = {{4, 4}, {120, 16}}; @@ -1050,15 +1050,15 @@ GHOST_TSuccess GHOST_WindowCocoa::setProgressBar(float progress) NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:[NSColor darkGrayColor] endingColor:[NSColor lightGrayColor]]; [gradient drawInRect:progressBox angle:90]; [gradient release]; - + [dockIcon unlockFocus]; - + [NSApp setApplicationIconImage:dockIcon]; [dockIcon release]; - + m_progressBarVisible = true; } - + [pool drain]; return GHOST_kSuccess; } @@ -1077,15 +1077,15 @@ GHOST_TSuccess GHOST_WindowCocoa::endProgressBar() { if (!m_progressBarVisible) return GHOST_kFailure; m_progressBarVisible = false; - + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + NSImage* dockIcon = [[NSImage alloc] initWithSize:NSMakeSize(128,128)]; [dockIcon lockFocus]; [[NSImage imageNamed:@"NSApplicationIcon"] drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0]; [dockIcon unlockFocus]; [NSApp setApplicationIconImage:dockIcon]; - + // We use notifications to inform the user when the progress reached 100% // Atm. just fire this when the progressbar ends, the behavior is controlled // in the NotificationCenter If Blender is not frontmost window, a message @@ -1095,7 +1095,7 @@ GHOST_TSuccess GHOST_WindowCocoa::endProgressBar() } [dockIcon release]; - + [pool drain]; return GHOST_kSuccess; } @@ -1105,9 +1105,9 @@ GHOST_TSuccess GHOST_WindowCocoa::endProgressBar() void GHOST_WindowCocoa::loadCursor(bool visible, GHOST_TStandardCursor cursor) const { static bool systemCursorVisible = true; - + NSCursor *tmpCursor =nil; - + if (visible != systemCursorVisible) { if (visible) { [NSCursor unhide]; @@ -1177,11 +1177,11 @@ void GHOST_WindowCocoa::loadCursor(bool visible, GHOST_TStandardCursor cursor) c GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorVisibility(bool visible) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]init]; - + if ([m_window isVisible]) { loadCursor(visible, getCursorShape()); } - + [pool drain]; return GHOST_kSuccess; } @@ -1190,7 +1190,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorVisibility(bool visible) GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode) { GHOST_TSuccess err = GHOST_kSuccess; - + if (mode != GHOST_kGrabDisable) { //No need to perform grab without warp as it is always on in OS X if (mode != GHOST_kGrabNormal) { @@ -1198,14 +1198,14 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode m_systemCocoa->getCursorPosition(m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]); setCursorGrabAccum(0, 0); - + if (mode == GHOST_kGrabHide) { setWindowCursorVisibility(false); } - + //Make window key if it wasn't to get the mouse move events [m_window makeKeyWindow]; - + [pool drain]; } } @@ -1214,14 +1214,14 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode m_systemCocoa->setCursorPosition(m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]); setWindowCursorVisibility(true); } - + /* Almost works without but important otherwise the mouse GHOST location can be incorrect on exit */ setCursorGrabAccum(0, 0); m_cursorGrabBounds.m_l= m_cursorGrabBounds.m_r= -1; /* disable */ } return err; } - + GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorShape(GHOST_TStandardCursor shape) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -1234,7 +1234,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorShape(GHOST_TStandardCursor sha if ([m_window isVisible]) { loadCursor(getCursorVisibility(), shape); } - + [pool drain]; return GHOST_kSuccess; } @@ -1269,15 +1269,15 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap NSImage *cursorImage; NSSize imSize; GHOST_TUns16 *cursorBitmap; - - + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - + if (m_customCursor) { [m_customCursor release]; m_customCursor = nil; } - + cursorImageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:nil pixelsWide:sizex @@ -1289,11 +1289,11 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap colorSpaceName:NSDeviceWhiteColorSpace bytesPerRow:(sizex/8 + (sizex%8 >0 ?1:0)) bitsPerPixel:1]; - - + + cursorBitmap = (GHOST_TUns16*)[cursorImageRep bitmapData]; nbUns16 = [cursorImageRep bytesPerPlane]/2; - + for (y=0; y<nbUns16; y++) { #if !defined(__LITTLE_ENDIAN__) cursorBitmap[y] = ~uns16ReverseBits((bitmap[2*y]<<0) | (bitmap[2*y+1]<<8)); @@ -1302,25 +1302,25 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap cursorBitmap[y] = ~uns16ReverseBits((bitmap[2*y+1]<<0) | (bitmap[2*y]<<8)); cursorBitmap[nbUns16+y] = uns16ReverseBits((mask[2*y+1]<<0) | (mask[2*y]<<8)); #endif - + } - - + + imSize.width = sizex; imSize.height= sizey; cursorImage = [[NSImage alloc] initWithSize:imSize]; [cursorImage addRepresentation:cursorImageRep]; - + hotSpotPoint.x = hotX; hotSpotPoint.y = hotY; - + //foreground and background color parameter is not handled for now (10.6) m_customCursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpotPoint]; - + [cursorImageRep release]; [cursorImage release]; - + if ([m_window isVisible]) { loadCursor(getCursorVisibility(), GHOST_kStandardCursorCustom); } @@ -1328,7 +1328,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap return GHOST_kSuccess; } -GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], +GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY) { return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1); diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 1377dc14781..621126eb4ec 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -362,7 +362,7 @@ class _draw_left_context_mode: panel="TOPBAR_PT_gpencil_primitive", text="Thickness Profile" ) - + if brush.gpencil_tool == 'FILL': settings = context.tool_settings.gpencil_sculpt row = layout.row(align=True) diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl index 22096535289..1ebb6797f63 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl @@ -194,7 +194,7 @@ void main(void) y_b = 0.0; } } - } + } /* generate the triangle strip */ uvfac = vec2(0.0, 0.0); mTexCoord = (color_type == GPENCIL_COLOR_SOLID) ? vec2(0, 0) : vec2(finaluvdata[1].x, y_a); diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index ebe0fa61b21..d25ff6b4c07 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -736,7 +736,7 @@ static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4 /* first point for adjacency (not drawn) */ if (i == 0) { gp_set_point_varying_color(points, ink, attr_id.color); - + if ((cyclic) && (totpoints > 2)) { immAttr1f(attr_id.thickness, max_ff((points + totpoints - 1)->pressure * thickness, 1.0f)); mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + totpoints - 1)->x); diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index 2df0edd3bf7..6e8dd11ee2f 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -206,7 +206,7 @@ static void gpsculpt_compute_lock_axis(tGP_BrushEditData *gso, bGPDspoint *pt, c float plane[4]; float mat[4][4]; float r_close[3]; - + loc_eul_size_to_mat4(mat, cursor->location, cursor->rotation_euler, |