Commit: 5e11f7f6109b1057487005cbde93dae6a1c30f62
Author: Campbell Barton
Date: Mon Feb 24 17:21:25 2014 +1100
https://developer.blender.org/rB5e11f7f6109b1057487005cbde93dae6a1c30f62
Fix for recent changes with NDOF
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 0849eb1..26d79e9 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1636,7 +1636,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator
*UNUSED(op), const wmEvent *e
/* we're panning here! so erase any leftover rotation from
other operators */
rv3d->rot_angle = 0.0f;
- if (has_translate == false)
+ if (!(has_translate || has_zoom))
return OPERATOR_CANCELLED;
ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
