[Bf-blender-cvs] [f97a64aa9b7] master: Fix T70252: Reverting to macOS 10.11 compatible API.

Stefan Werner noreply at git.blender.org
Wed Oct 2 10:22:42 CEST 2019


Commit: f97a64aa9b7b384f8221a1ef4f2eef9cde1238db
Author: Stefan Werner
Date:   Wed Oct 2 10:22:26 2019 +0200
Branches: master
https://developer.blender.org/rBf97a64aa9b7b384f8221a1ef4f2eef9cde1238db

Fix T70252: Reverting to macOS 10.11 compatible API.

===================================================================

M	intern/ghost/intern/GHOST_WindowCocoa.mm

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index e46e589fea4..6087df978fa 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -388,7 +388,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa,
   [m_window setAcceptsMouseMovedEvents:YES];
 
   NSView *contentview = [m_window contentView];
-  [contentview setAllowedTouchTypes:(NSTouchTypeMaskDirect | NSTouchTypeMaskIndirect)];
+  [contentview setAcceptsTouchEvents:YES];
 
   [m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
                                                               NSStringPboardType,



More information about the Bf-blender-cvs mailing list