Merge branch 'master' into blender2.8
This commit is contained in:
commit
06df05a35b
@ -236,7 +236,7 @@ option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ${_init_OPENCOLO
|
|||||||
# Compositor
|
# Compositor
|
||||||
option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
|
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 "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)
|
option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
|
||||||
|
@ -412,7 +412,7 @@ static void viewops_data_create(
|
|||||||
|
|
||||||
/* set the view from the camera, if view locking is enabled.
|
/* set the view from the camera, if view locking is enabled.
|
||||||
* we may want to make this optional but for now its needed always */
|
* 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.dist = rv3d->dist;
|
||||||
vod->init.camzoom = rv3d->camzoom;
|
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)
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -154,7 +154,7 @@ void ED_view3d_smooth_view_ex(
|
|||||||
* we allow camera option locking to initialize the view settings from the camera.
|
* we allow camera option locking to initialize the view settings from the camera.
|
||||||
*/
|
*/
|
||||||
if (sview->camera == NULL && sview->camera_old == NULL) {
|
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 */
|
/* store the options we want to end with */
|
||||||
|
Loading…
Reference in New Issue
Block a user