diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 18:07:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 18:07:09 +0300 |
| commit | 0671814e3b9450e0fed5109e059b6f9dc421e120 (patch) | |
| tree | 06994ff0af927c1089bf2c23e82318c700c34d64 /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | cb4884f50b80c7a5b115bb066b9b662af7e62297 (diff) | |
| parent | 0b5b464e823660f4ce47107d63004e762372122e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index fd29658061e..4dda0f51522 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1681,7 +1681,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event) viewops_data_alloc(C, op); viewops_data_create_ex( C, op, event, - viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false), false); + false, viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false)); vod = op->customdata; ED_view3d_smooth_view_force_finish(C, vod->v3d, vod->ar); @@ -1750,7 +1750,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev viewops_data_alloc(C, op); viewops_data_create_ex( C, op, event, - viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false), false); + false, viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false)); vod = op->customdata; |