diff options
author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-10-23 16:12:44 +0400 |
---|---|---|
committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-10-23 16:12:44 +0400 |
commit | 068ab484aca1af7654d8a710d6a2636f13641a72 (patch) | |
tree | 30dcebd9ebf652ef66d49480f9e5bf167e258ff2 | |
parent | 5133f75779eda6e9f8f8072dfee318b5877481fd (diff) |
Cocoa / Mac:
- tablet : fix pressure retrieval => value sliding now works with tablet, UV-painting is pressure sensitive, and no more crash when clicking on window minimize button with the tablet
- update CMake file to remove unneeded folders in the app bundle (the __MACOSX stuff). From Jens' patch
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 5 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 2d665012bf1..20b190cc41f 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1046,11 +1046,14 @@ GHOST_TSuccess GHOST_SystemCocoa::handleTabletEvent(void *eventPtr, short eventT { NSEvent *event = (NSEvent *)eventPtr; GHOST_IWindow* window = m_windowManager->getActiveWindow(); + + if (!window) return GHOST_kFailure; + GHOST_TabletData& ct=((GHOST_WindowCocoa*)window)->GetCocoaTabletData(); switch (eventType) { case NSTabletPoint: - ct.Pressure = [event tangentialPressure]; + ct.Pressure = [event pressure]; ct.Xtilt = [event tilt].x; ct.Ytilt = [event tilt].y; break; diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 28985daf466..57a1f8e00a5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -173,6 +173,7 @@ IF(WITH_INSTALL) ADD_CUSTOM_COMMAND( TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;" + COMMAND find ${TARGETDIR} -name __MACOSX -prune -exec rm -rf {} "\;" ) |