Merge branch 'master' into blender2.8
This commit is contained in:
commit
d12461a9ba
|
@ -412,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(depsgraph, vod->v3d, vod->rv3d, false);
|
||||
|
||||
vod->init.dist = rv3d->dist;
|
||||
vod->init.camzoom = rv3d->camzoom;
|
||||
|
|
|
@ -488,7 +488,7 @@ void ED_view3d_camera_lock_init_ex(const Depsgraph *depsgraph, View3D *v3d, Regi
|
|||
|
||||
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(depsgraph, v3d, rv3d, false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -154,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(depsgraph, v3d, rv3d, true);
|
||||
}
|
||||
|
||||
/* store the options we want to end with */
|
||||
|
|
Loading…
Reference in New Issue