diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 03:09:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 03:09:42 +0300 |
commit | dd4c87cd0451376bce96c459d90c2b95409f0d11 (patch) | |
tree | 576ee74ff71032c2b6eec94e549a1dba90edec96 /source/blender/blenkernel/intern | |
parent | aca13040dac986e34468e7d533d0c3cc970fda90 (diff) | |
parent | aa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh_cache.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/editmesh_cache.c b/source/blender/blenkernel/intern/editmesh_cache.c index f0af0ede9b1..09bf7e9b39b 100644 --- a/source/blender/blenkernel/intern/editmesh_cache.c +++ b/source/blender/blenkernel/intern/editmesh_cache.c @@ -107,12 +107,12 @@ void BKE_editmesh_cache_ensure_poly_centers(BMEditMesh *em, EditMeshData *emd) BM_mesh_elem_index_ensure(bm, BM_VERT); BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { - BM_face_calc_center_mean_vcos(bm, efa, polyCos[i], vertexCos); + BM_face_calc_center_median_vcos(bm, efa, polyCos[i], vertexCos); } } else { BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { - BM_face_calc_center_mean(efa, polyCos[i]); + BM_face_calc_center_median(efa, polyCos[i]); } } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 20eab1369d1..e76b1776b25 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -662,7 +662,7 @@ void BKE_scene_init(Scene *sce) sce->toolsettings->autokey_mode = U.autokey_mode; - sce->toolsettings->transform_pivot_point = V3D_AROUND_CENTER_MEAN; + sce->toolsettings->transform_pivot_point = V3D_AROUND_CENTER_MEDIAN; sce->toolsettings->snap_mode = SCE_SNAP_MODE_INCREMENT; sce->toolsettings->snap_node_mode = SCE_SNAP_MODE_GRID; sce->toolsettings->snap_uv_mode = SCE_SNAP_MODE_INCREMENT; |