Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 07:15:52 +0000 (18:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 07:16:21 +0000 (18:16 +1100)
1  2 
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_utils.c
source/blender/editors/space_view3d/view3d_view.c

index ae093b2f9e223f62aa7dac9371b4a14766141e2e,8442f5ea60e624e2f4556b1ea62719ade600525f..abd607a4f1907544dafac4d4f7db32e092510216
@@@ -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;
index d20dfa10923be62dc70963229bd1f29e169c07f2,d90f4c32fc022268ba9fd1518f0c4ca29d70adef..add84655682c976feaba884180f00618b37ea3e7
@@@ -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);
  }
  
  /**
index 98ae57e9c426614aaee5460d8a162840e06b9ebf,52b9b9e49be53d4083c2c43f831e5baca647abc7..4a637443a8ddf1bb4846bff8c133929f91063584
@@@ -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 */