Revision: 37623
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37623
Author:   merwin
Date:     2011-06-18 19:40:30 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
SpacePilotPro has 31 buttons, not 29 -- '+' and '-' work again

Modified Paths:
--------------
    branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManager.cpp

Modified: branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManager.cpp  
2011-06-18 18:41:20 UTC (rev 37622)
+++ branches/merwin-spacenav/intern/ghost/intern/GHOST_NDOFManager.cpp  
2011-06-18 19:40:30 UTC (rev 37623)
@@ -159,22 +159,18 @@
                                case 0xC626:
                                        m_deviceType = NDOF_SpaceNavigator;
                                        m_buttonCount = 2;
-//                                     m_buttonMask = 0x3; // 2 buttons
                                        break;
                                case 0xC628:
                                        m_deviceType = NDOF_SpaceNavigator; // 
for Notebooks
                                        m_buttonCount = 2;
-//                                     m_buttonMask = 0x3; // 2 buttons
                                        break;
                                case 0xC627:
                                        m_deviceType = NDOF_SpaceExplorer;
                                        m_buttonCount = 15;
-//                                     m_buttonMask = 0x7FFF; // 15 buttons
                                        break;
                                case 0xC629:
                                        m_deviceType = NDOF_SpacePilotPro;
-                                       m_buttonCount = 29;
-//                                     m_buttonMask = 0x1FFFFFFF; // 29 buttons
+                                       m_buttonCount = 31;
                                        break;
 
                                // -- older devices --

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to