diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-03 11:09:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-03 11:09:11 +0300 |
| commit | e92cf80a5c8ead0cfc87364e61136e34b7215775 (patch) | |
| tree | 43a4d8e63583f770ad00ef32237e515fb5c512db /source/blender/editors/space_view3d | |
| parent | fe8fcb4343a5da4ec97db697a70afe423898e833 (diff) | |
Fix for last commit
Missed check for non-camera view frame
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_manipulator_camera.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c b/source/blender/editors/space_view3d/view3d_manipulator_camera.c index 5281b212e4c..856a697cf45 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_camera.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_camera.c @@ -343,9 +343,14 @@ static void WIDGETGROUP_camera_view_draw_prepare(const bContext *C, wmManipulato ARegion *ar = CTX_wm_region(C); RegionView3D *rv3d = ar->regiondata; - Scene *scene = CTX_data_scene(C); View3D *v3d = CTX_wm_view3d(C); - ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewgroup->state.view_border, false); + if (rv3d->persp == RV3D_CAMOB) { + Scene *scene = CTX_data_scene(C); + ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewgroup->state.view_border, false); + } + else { + viewgroup->state.view_border = (rctf){.xmin = 0, .ymin = 0, .xmax = ar->winx, .ymax = ar->winy}; + } } static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmManipulatorGroup *mgroup) |