[Bf-blender-cvs] [04f43d4cdf0] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 04f43d4cdf0753e655bd073be65f981dadbbd63d
Author: Campbell Barton
Date:   Sat Apr 29 03:39:24 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB04f43d4cdf0753e655bd073be65f981dadbbd63d

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index 028d613ba8c,f712c790663..42e8759c6dc
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -705,6 -735,33 +733,34 @@@ static void viewops_data_create_ex
  	ViewOpsData *vod = op->customdata;
  	RegionView3D *rv3d = vod->rv3d;
  
+ 	/* we need the depth info before changing any viewport options */
+ 	if (orbit_mode == VIEWOPS_ORBIT_DEPTH) {
++		struct Depsgraph *graph = CTX_data_depsgraph(C);
+ 		float fallback_depth_pt[3];
+ 
+ 		view3d_operator_needs_opengl(C); /* needed for zbuf drawing */
+ 
+ 		negate_v3_v3(fallback_depth_pt, rv3d->ofs);
+ 
+ 		vod->use_dyn_ofs = ED_view3d_autodist(
 -		        vod->scene, vod->ar, vod->v3d,
++		        graph, vod->scene, vod->ar, vod->v3d,
+ 		        event->mval, vod->dyn_ofs, true, fallback_depth_pt);
+ 	}
+ 	else {
+ 		vod->use_dyn_ofs = false;
+ 	}
+ 
+ 	if (switch_from_camera) {
+ 		/* switch from camera view when: */
+ 		if (view3d_ensure_persp(vod->v3d, vod->ar)) {
+ 			/* If we're switching from camera view to the perspective one,
+ 			 * need to tag viewport update, so camera vuew and borders
+ 			 * are properly updated.
+ 			 */
+ 			ED_region_tag_redraw(vod->ar);
+ 		}
+ 	}
+ 
  	/* set the view from the camera, if view locking is enabled.
  	 * we may want to make this optional but for now its needed always */
  	ED_view3d_camera_lock_init(vod->v3d, vod->rv3d);