Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-05 03:03:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-05 03:03:48 +0300
commit9c963d363e9f392318ffd3c8f2ed15e1b84e5a51 (patch)
treed58a81e53137cdcc7746f7beb6a7966203651586 /source/blender/editors/space_view3d/view3d_walk.c
parentb83cf9d340c54ec3cd5e2cde98d6dfb0e739c4bf (diff)
parent45c11c1a1bd07cca255abdb1923e69f0242c36fd (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_walk.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_walk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index 68a40f33368..d4bb213e5c7 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -280,7 +280,7 @@ static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *ar, void *a
int xoff, yoff;
rctf viewborder;
- if (walk->scene->camera) {
+ if (ED_view3d_cameracontrol_object_get(walk->v3d_camera_control)) {
ED_view3d_calc_camera_border(walk->scene, walk->depsgraph, ar, walk->v3d, walk->rv3d, &viewborder, false);
xoff = viewborder.xmin + BLI_rctf_size_x(&viewborder) * 0.5f;
yoff = viewborder.ymin + BLI_rctf_size_y(&viewborder) * 0.5f;