[Bf-blender-cvs] [9c963d363e9] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 9c963d363e9f392318ffd3c8f2ed15e1b84e5a51
Author: Campbell Barton
Date:   Wed Dec 5 11:03:48 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9c963d363e9f392318ffd3c8f2ed15e1b84e5a51

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/view3d_fly.c
index 345d9fe39de,175dab28cbe..de5d5d29e52
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@@ -195,8 -240,8 +195,8 @@@ static void drawFlyPixel(const struct b
  	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->ar, fly->v3d, fly->rv3d, &viewborder, false);
 +		ED_view3d_calc_camera_border(fly->scene, fly->depsgraph, fly->ar, fly->v3d, fly->rv3d, &viewborder, false);
  		xoff = viewborder.xmin;
  		yoff = viewborder.ymin;
  	}
@@@ -377,8 -411,8 +376,8 @@@ static bool initFlyInfo(bContext *C, Fl
  	        (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->ar, fly->v3d, fly->rv3d, &viewborder, false);
 +		ED_view3d_calc_camera_border(fly->scene, fly->depsgraph, fly->ar, fly->v3d, fly->rv3d, &viewborder, false);
  
  		fly->width = BLI_rctf_size_x(&viewborder);
  		fly->height = BLI_rctf_size_y(&viewborder);
diff --cc source/blender/editors/space_view3d/view3d_walk.c
index 68a40f33368,b81d84a1436..d4bb213e5c7
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@@ -280,8 -327,8 +280,8 @@@ static void drawWalkPixel(const struct 
  	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, ar, walk->v3d, walk->rv3d, &viewborder, false);
 +		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;
  	}