blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix compile error when compiling with WITH_INPUT_NDOF after View2D changes 

Actually, fixes compile error and an incorrect poll.

Caused by 21fc4ae206 and 3a1cf838ca.
The poll has to perfrom the `view_zoom_poll()` logic to ensure correct context.
This commit is contained in:
Julian Eisel 2020-10-03 21:30:38 +02:00
parent 05bf109b52
commit 9668fc582c
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/editors/interface/view2d_ops.c
View File

@ -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;
}
view_zoom_axis_lock_defaults(C, do_zoom_xy);
vzd = op->customdata;
view_zoomstep_apply_ex(
C, vzd, false, do_zoom_xy[0] ? zoom_factor : 0.0f, do_zoom_xy[1] ? zoom_factor : 0.0f);
view_zoomstep_exit(op);
if (U.ndof_flag & NDOF_ZOOM_INVERT) {
zoom_factor = -zoom_factor;
}
view_zoom_axis_lock_defaults(C, do_zoom_xy);
view_zoomdrag_init(C, op);
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);
}
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;