diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-05 03:03:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-05 03:03:48 +0300 |
| commit | 9c963d363e9f392318ffd3c8f2ed15e1b84e5a51 (patch) | |
| tree | d58a81e53137cdcc7746f7beb6a7966203651586 /source/blender/editors/space_view3d/view3d_fly.c | |
| parent | b83cf9d340c54ec3cd5e2cde98d6dfb0e739c4bf (diff) | |
| parent | 45c11c1a1bd07cca255abdb1923e69f0242c36fd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_fly.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 345d9fe39de..de5d5d29e52 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -195,7 +195,7 @@ static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar), int xoff, yoff; float x1, x2, y1, y2; - if (fly->scene->camera) { + if (ED_view3d_cameracontrol_object_get(fly->v3d_camera_control)) { ED_view3d_calc_camera_border(fly->scene, fly->depsgraph, fly->ar, fly->v3d, fly->rv3d, &viewborder, false); xoff = viewborder.xmin; yoff = viewborder.ymin; @@ -297,7 +297,6 @@ enum { static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent *event) { wmWindow *win = CTX_wm_window(C); - rctf viewborder; float upvec[3]; /* tmp */ @@ -377,7 +376,7 @@ static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent (U.uiflag & USER_CAM_LOCK_NO_PARENT) == 0); /* calculate center */ - if (fly->scene->camera) { + if (ED_view3d_cameracontrol_object_get(fly->v3d_camera_control)) { ED_view3d_calc_camera_border(fly->scene, fly->depsgraph, fly->ar, fly->v3d, fly->rv3d, &viewborder, false); fly->width = BLI_rctf_size_x(&viewborder); |