Revision: 24065
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24065
Author: damien78
Date: 2009-10-23 14:12:44 +0200 (Fri, 23 Oct 2009)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-23
00:44:18 UTC (rev 24064)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-23
12:12:44 UTC (rev 24065)
@@ -1046,11 +1046,14 @@
{
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;
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2009-10-23 00:44:18 UTC (rev
24064)
+++ trunk/blender/source/creator/CMakeLists.txt 2009-10-23 12:12:44 UTC (rev
24065)
@@ -173,6 +173,7 @@
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 {} "\;"
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
