[Bf-blender-cvs] [ab28abcb6ba] master: Cleanup: remove the last button from NDOF button enum values

[Campbell Barton]

Commit: ab28abcb6baaa728d8e2c30c4c98fef3655aa4dd
Author: Campbell Barton
Date:   Wed Oct 19 12:58:36 2022 +1100
Branches: master
https://developer.blender.org/rBab28abcb6baaa728d8e2c30c4c98fef3655aa4dd

Cleanup: remove the last button from NDOF button enum values

This is only used for comparison, no need to make it part of the enum.

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

M	intern/ghost/intern/GHOST_NDOFManager.cpp
M	intern/ghost/intern/GHOST_NDOFManager.h

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

diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index 2754b9c8a6f..555e22dadbb 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -81,8 +81,6 @@ static const char *ndof_button_names[] = {
     "NDOF_BUTTON_ALT",
     "NDOF_BUTTON_SHIFT",
     "NDOF_BUTTON_CTRL",
-    /* the end */
-    "NDOF_BUTTON_LAST",
 };
 
 /* Shared by the latest 3Dconnexion hardware
@@ -389,7 +387,7 @@ void GHOST_NDOFManager::sendButtonEvent(NDOF_ButtonT button,
                                         uint64_t time,
                                         GHOST_IWindow *window)
 {
-  GHOST_ASSERT(button > NDOF_BUTTON_NONE && button < NDOF_BUTTON_LAST,
+  GHOST_ASSERT(button > NDOF_BUTTON_NONE && button < NDOF_BUTTON_NUM,
                "rogue button trying to escape NDOF manager");
 
   GHOST_EventNDOFButton *event = new GHOST_EventNDOFButton(time, window);
diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h
index 58371826527..c883c2dce65 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.h
+++ b/intern/ghost/intern/GHOST_NDOFManager.h
@@ -87,8 +87,7 @@ typedef enum {
   NDOF_BUTTON_ALT,
   NDOF_BUTTON_SHIFT,
   NDOF_BUTTON_CTRL,
-  /* The end. */
-  NDOF_BUTTON_LAST
+#define NDOF_BUTTON_NUM (NDOF_BUTTON_CTRL + 1)
 } NDOF_ButtonT;
 
 class GHOST_NDOFManager {