[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46384] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: GHOST/Cocoa: revert tablet detection commit for continuous grab, apparently it is

[Brecht Van Lommel]

Revision: 46384
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46384
Author:   blendix
Date:     2012-05-07 13:42:25 +0000 (Mon, 07 May 2012)
Log Message:
-----------
GHOST/Cocoa: revert tablet detection commit for continuous grab, apparently it is
already doing it and this change breaks something? Still it seems strange that it
is doing tablet stuff in this part of the code then.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-05-07 10:53:12 UTC (rev 46383)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-05-07 13:42:25 UTC (rev 46384)
@@ -1450,8 +1450,6 @@
 		return GHOST_kFailure;
 	}
 
-	bool is_tablet = false;
-	
 	switch ([event type])
     {
 		case NSLeftMouseDown:
@@ -1459,7 +1457,7 @@
 		case NSOtherMouseDown:
 			pushEvent(new GHOST_EventButton([event timestamp]*1000, GHOST_kEventButtonDown, window, convertButton([event buttonNumber])));
 			//Handle tablet events combined with mouse events
-			is_tablet = handleTabletEvent(event);
+			handleTabletEvent(event);
 			break;
 						
 		case NSLeftMouseUp:
@@ -1467,21 +1465,25 @@
 		case NSOtherMouseUp:
 			pushEvent(new GHOST_EventButton([event timestamp]*1000, GHOST_kEventButtonUp, window, convertButton([event buttonNumber])));
 			//Handle tablet events combined with mouse events
-			is_tablet = handleTabletEvent(event);
+			handleTabletEvent(event);
 			break;
 			
 		case NSLeftMouseDragged:
 		case NSRightMouseDragged:
 		case NSOtherMouseDragged:				
 			//Handle tablet events combined with mouse events
-			is_tablet = handleTabletEvent(event);
+			handleTabletEvent(event);
 			
 		case NSMouseMoved: 
 			{
 				GHOST_TGrabCursorMode grab_mode = window->getCursorGrabMode();
 
-				if (is_tablet && window->getCursorGrabModeIsWarp())
+				/* TODO: CHECK IF THIS IS A TABLET EVENT */
+				bool is_tablet = false;
+
+				if (is_tablet && window->getCursorGrabModeIsWarp()) {
 					grab_mode = GHOST_kGrabDisable;
+				}
 
 				switch (grab_mode) {
 					case GHOST_kGrabHide: //Cursor hidden grab operation : no cursor move