[Bf-blender-cvs] [9668fc582cc] master: Fix compile error when compiling with WITH_INPUT_NDOF after View2D changes

[Julian Eisel]

Commit: 9668fc582ccb0a8030e4820c00f2d3888d22b7e6
Author: Julian Eisel
Date:   Sat Oct 3 21:30:38 2020 +0200
Branches: master
https://developer.blender.org/rB9668fc582ccb0a8030e4820c00f2d3888d22b7e6

Fix compile error when compiling with WITH_INPUT_NDOF after View2D changes

Actually, fixes compile error and an incorrect poll.

Caused by 21fc4ae20692 and 3a1cf838ca09.
The poll has to perfrom the `view_zoom_poll()` logic to ensure correct context.

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

M	source/blender/editors/interface/view2d_ops.c

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

diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index 8053758c9f2..2339ba72a52 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -1635,25 +1635,23 @@ static int view2d_ndof_invoke(bContext *C, wmOperator *op, const wmEvent *event)
   }
 
   if (has_zoom) {
-    if (view_zoomdrag_init(C, op)) {
-      v2dViewZoomData *vzd;
-      float zoom_factor = zoom_sensitivity * ndof->dt * -ndof->tvec[2];
+    float zoom_factor = zoom_sensitivity * ndof->dt * -ndof->tvec[2];
 
-      bool do_zoom_xy[2];
+    bool do_zoom_xy[2];
 
-      if (U.ndof_flag & NDOF_ZOOM_INVERT) {
-        zoom_factor = -zoom_factor;
-      }
+    if (U.ndof_flag & NDOF_ZOOM_INVERT) {
+      zoom_factor = -zoom_factor;
+    }
 
-      view_zoom_axis_lock_defaults(C, do_zoom_xy);
+    view_zoom_axis_lock_defaults(C, do_zoom_xy);
 
-      vzd = op->customdata;
+    view_zoomdrag_init(C, op);
 
-      view_zoomstep_apply_ex(
-          C, vzd, false, do_zoom_xy[0] ? zoom_factor : 0.0f, do_zoom_xy[1] ? zoom_factor : 0.0f);
+    v2dViewZoomData *vzd = op->customdata;
+    view_zoomstep_apply_ex(
+        C, vzd, do_zoom_xy[0] ? zoom_factor : 0.0f, do_zoom_xy[1] ? zoom_factor : 0.0f);
 
-      view_zoomstep_exit(op);
-    }
+    view_zoomstep_exit(op);
   }
 
   return OPERATOR_FINISHED;
@@ -1668,7 +1666,7 @@ static void VIEW2D_OT_ndof(wmOperatorType *ot)
 
   /* api callbacks */
   ot->invoke = view2d_ndof_invoke;
-  ot->poll = view2d_poll;
+  ot->poll = view_zoom_poll;
 
   /* flags */
   ot->flag = OPTYPE_LOCK_BYPASS;