Commit: 5ef4b0438cf4773e7dd8c661388bb2c3079869bf
Author: Campbell Barton
Date: Tue Mar 19 15:03:21 2019 +1100
Branches: master
https://developer.blender.org/rB5ef4b0438cf4773e7dd8c661388bb2c3079869bf
Cleanup: trailing space
===================================================================
M intern/cycles/device/opencl/opencl.h
M intern/cycles/device/opencl/opencl_split.cpp
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
M intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemPathsCocoa.mm
M intern/ghost/intern/GHOST_WindowCocoa.mm
M release/scripts/startup/bl_ui/space_topbar.py
M source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_brush.c
===================================================================
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
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
