diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-06-01 20:56:11 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-06-01 20:56:11 +0300 |
commit | 0af93cf1ac276456619fc2e903c52a97fd09b9fb (patch) | |
tree | 741531a390689baf582afec2cfd132909d2888b7 | |
parent | 237e17a957ea16d4f326f8babfdb49b8d954e529 (diff) | |
parent | 020bbbb046d9d7a6fea58b3cbb06c2a977d01454 (diff) |
Merge branch 'master' into blender2.8
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 77bf3158f6c..54c943661c0 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2388,7 +2388,8 @@ static void createTransEditVerts(TransInfo *t) int island_info_tot; int *island_vert_map = NULL; - const bool is_island_center = (t->around == V3D_AROUND_LOCAL_ORIGINS) && (t->mode != TFM_TRANSLATION); + /* Even for translation this is needed because of island-orientation, see: T51651. */ + const bool is_island_center = (t->around == V3D_AROUND_LOCAL_ORIGINS); /* Original index of our connected vertex when connected distances are calculated. * Optional, allocate if needed. */ int *dists_index = NULL; @@ -2454,11 +2455,6 @@ static void createTransEditVerts(TransInfo *t) editmesh_set_connectivity_distance(em->bm, mtx, dists, dists_index); } - /* Only in case of rotation and resize, we want the elements of the edited - * object to behave as groups whose pivot are the individual origins - * - * TODO: use island_info to detect the closest point when the "Snap Target" - * in Blender UI is "Closest" */ if (is_island_center) { /* In this specific case, near-by vertices will need to know the island of the nearest connected vertex. */ const bool calc_single_islands = ( |