[Bf-blender-cvs] [c72317943b6] master: Attempt to fix build errors on macOS
Julian Eisel
noreply at git.blender.org
Fri Mar 6 11:44:00 CET 2020
Commit: c72317943b60cfb73df08141302b8db64bed5fe3
Author: Julian Eisel
Date: Fri Mar 6 11:43:13 2020 +0100
Branches: master
https://developer.blender.org/rBc72317943b60cfb73df08141302b8db64bed5fe3
Attempt to fix build errors on macOS
Mistake in 5be0e3430d13
===================================================================
M intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index ee05505f682..a7ec137a0a4 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1001,28 +1001,32 @@ GHOST_TSuccess GHOST_SystemCocoa::handleApplicationBecomeActiveEvent()
(modifiers & NSEventModifierFlagShift) ? GHOST_kEventKeyDown :
GHOST_kEventKeyUp,
window,
- GHOST_kKeyLeftShift));
+ GHOST_kKeyLeftShift,
+ false));
}
if ((modifiers & NSEventModifierFlagControl) != (m_modifierMask & NSEventModifierFlagControl)) {
pushEvent(new GHOST_EventKey(getMilliSeconds(),
(modifiers & NSEventModifierFlagControl) ? GHOST_kEventKeyDown :
GHOST_kEventKeyUp,
window,
- GHOST_kKeyLeftControl));
+ GHOST_kKeyLeftControl,
+ false));
}
if ((modifiers & NSEventModifierFlagOption) != (m_modifierMask & NSEventModifierFlagOption)) {
pushEvent(new GHOST_EventKey(getMilliSeconds(),
(modifiers & NSEventModifierFlagOption) ? GHOST_kEventKeyDown :
GHOST_kEventKeyUp,
window,
- GHOST_kKeyLeftAlt));
+ GHOST_kKeyLeftAlt,
+ false));
}
if ((modifiers & NSEventModifierFlagCommand) != (m_modifierMask & NSEventModifierFlagCommand)) {
pushEvent(new GHOST_EventKey(getMilliSeconds(),
(modifiers & NSEventModifierFlagCommand) ? GHOST_kEventKeyDown :
GHOST_kEventKeyUp,
window,
- GHOST_kKeyOS));
+ GHOST_kKeyOS,
+ false));
}
m_modifierMask = modifiers;
@@ -1805,8 +1809,13 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
}
if ([event type] == NSEventTypeKeyDown) {
- pushEvent(new GHOST_EventKey(
- [event timestamp] * 1000, GHOST_kEventKeyDown, window, keyCode, ascii, utf8_buf, false));
+ pushEvent(new GHOST_EventKey([event timestamp] * 1000,
+ GHOST_kEventKeyDown,
+ window,
+ keyCode,
+ ascii,
+ utf8_buf,
+ false));
#if 0
printf("Key down rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c utf8=%s\n",
[event keyCode],
@@ -1843,7 +1852,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
(modifiers & NSEventModifierFlagShift) ? GHOST_kEventKeyDown :
GHOST_kEventKeyUp,
window,
- GHOST_kKeyLeftShift));
+ GHOST_kKeyLeftShift,
+ false));
}
if ((modifiers & NSEventModifierFlagControl) !=
(m_modifierMask & NSEventModifierFlagControl)) {
@@ -1851,7 +1861,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
[event timestamp] * 1000,
(modifiers & NSEventModifierFlagControl) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp,
window,
- GHOST_kKeyLeftControl));
+ GHOST_kKeyLeftControl,
+ false));
}
if ((modifiers & NSEventModifierFlagOption) !=
(m_modifierMask & NSEventModifierFlagOption)) {
@@ -1859,7 +1870,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
[event timestamp] * 1000,
(modifiers & NSEventModifierFlagOption) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp,
window,
- GHOST_kKeyLeftAlt));
+ GHOST_kKeyLeftAlt,
+ false));
}
if ((modifiers & NSEventModifierFlagCommand) !=
(m_modifierMask & NSEventModifierFlagCommand)) {
@@ -1867,7 +1879,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
[event timestamp] * 1000,
(modifiers & NSEventModifierFlagCommand) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp,
window,
- GHOST_kKeyOS));
+ GHOST_kKeyOS,
+ false));
}
m_modifierMask = modifiers;
More information about the Bf-blender-cvs
mailing list