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

[Campbell Barton]

Commit: d12461a9ba82d3654acc313b2b8b7fcc8427bf0d
Author: Campbell Barton
Date:   Fri Nov 30 18:15:52 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd12461a9ba82d3654acc313b2b8b7fcc8427bf0d

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index ae093b2f9e2,8442f5ea60e..abd607a4f19
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -412,7 -402,7 +412,7 @@@ static void viewops_data_create
  
  	/* 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(depsgraph, vod->v3d, vod->rv3d);
 -	ED_view3d_camera_lock_init_ex(vod->v3d, vod->rv3d, false);
++	ED_view3d_camera_lock_init_ex(depsgraph, vod->v3d, vod->rv3d, false);
  
  	vod->init.dist = rv3d->dist;
  	vod->init.camzoom = rv3d->camzoom;
diff --cc source/blender/editors/space_view3d/view3d_utils.c
index d20dfa10923,d90f4c32fc0..add84655682
--- a/source/blender/editors/space_view3d/view3d_utils.c
+++ b/source/blender/editors/space_view3d/view3d_utils.c
@@@ -486,9 -458,9 +486,9 @@@ void ED_view3d_camera_lock_init_ex(cons
  	}
  }
  
 -void ED_view3d_camera_lock_init(View3D *v3d, RegionView3D *rv3d)
 +void ED_view3d_camera_lock_init(const Depsgraph *depsgraph, View3D *v3d, RegionView3D *rv3d)
  {
- 	ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, true);
 -	ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
++	ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
  }
  
  /**
diff --cc source/blender/editors/space_view3d/view3d_view.c
index 98ae57e9c42,52b9b9e49be..4a637443a8d
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@@ -154,7 -156,7 +154,7 @@@ void ED_view3d_smooth_view_ex
  	 * we allow camera option locking to initialize the view settings from the camera.
  	 */
  	if (sview->camera == NULL && sview->camera_old == NULL) {
- 		ED_view3d_camera_lock_init(depsgraph, v3d, rv3d);
 -		ED_view3d_camera_lock_init_ex(v3d, rv3d, true);
++		ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, true);
  	}
  
  	/* store the options we want to end with */