View3D Snap Cursor: sanitize and increase the maximum amount of states

3 is a small amount as each viewport creates a gizmo that creates its own state

Now if the state is not created, the gizmos use the last state.

1 files changed, 8 insertions, 2 deletions

diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.c b/source/blender/editors/space_view3d/view3d_cursor_snap.c
index 5eb9ec3625c..9c45a89c3ff 100644
--- a/source/blender/editors/space_view3d/view3d_cursor_snap.c
+++ b/source/blender/editors/space_view3d/view3d_cursor_snap.c
@@ -54,7 +54,7 @@
 
 #include "WM_api.h"
 
-#define STATE_LEN 3
+#define STATE_LEN 8
 
 typedef struct SnapStateIntern {
   V3DSnapCursorState snap_state;
@@ -925,7 +925,6 @@ V3DSnapCursorState *ED_view3d_cursor_snap_active(void)
     }
   }
 
-  BLI_assert(false);
   data_intern->state_active_len--;
   return NULL;
 }
@@ -938,6 +937,10 @@ void ED_view3d_cursor_snap_deactive(V3DSnapCursorState *state)
     return;
   }
 
+  if (!state) {
+    return;
+  }
+
   SnapStateIntern *state_intern = (SnapStateIntern *)state;
   if (!state_intern->is_active) {
     return;
@@ -956,6 +959,9 @@ void ED_view3d_cursor_snap_deactive(V3DSnapCursorState *state)
 void ED_view3d_cursor_snap_prevpoint_set(V3DSnapCursorState *state, const float prev_point[3])
 {
   SnapCursorDataIntern *data_intern = &g_data_intern;
+  if (!state) {
+    state = ED_view3d_cursor_snap_state_get();
+  }
   if (prev_point) {
     copy_v3_v3(data_intern->prevpoint_stack, prev_point);
     state->prevpoint = data_intern->prevpoint_stack;