Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 30 Nov 2018 11:16:19 +0000 (12:16 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 30 Nov 2018 11:16:19 +0000 (12:16 +0100)
CMakeLists.txt
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 5741588b6af859a0cd9e43237ad9058d6ab8f70b..092eb926afb36db7507beffbbda7f092d0ab78b0 100644 (file)
@@ -236,7 +236,7 @@ option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLO
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
 
-option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV)
+option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" ${_init_OPENSUBDIV})
 
 option(WITH_OPENVDB       "Enable features relying on OpenVDB" OFF)
 option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
index abd607a4f1907544dafac4d4f7db32e092510216..ae093b2f9e223f62aa7dac9371b4a14766141e2e 100644 (file)
@@ -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_ex(depsgraph, vod->v3d, vod->rv3d, false);
+       ED_view3d_camera_lock_init(depsgraph, vod->v3d, vod->rv3d);
 
        vod->init.dist = rv3d->dist;
        vod->init.camzoom = rv3d->camzoom;
index add84655682c976feaba884180f00618b37ea3e7..d20dfa10923be62dc70963229bd1f29e169c07f2 100644 (file)
@@ -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, false);
+       ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, true);
 }
 
 /**
index 4a637443a8ddf1bb4846bff8c133929f91063584..98ae57e9c426614aaee5460d8a162840e06b9ebf 100644 (file)
@@ -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_ex(depsgraph, v3d, rv3d, true);
+               ED_view3d_camera_lock_init(depsgraph, v3d, rv3d);
        }
 
        /* store the options we want to end with */