[Bf-blender-cvs] [68cfce1519e] master: Merge branch 'blender-v2.83-release'

[Campbell Barton]

Commit: 68cfce1519ed63dc0a231c7de81c26f3f9c810f1
Author: Campbell Barton
Date:   Thu Apr 23 18:38:41 2020 +1000
Branches: master
https://developer.blender.org/rB68cfce1519ed63dc0a231c7de81c26f3f9c810f1

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc source/blender/editors/object/object_transform.c
index 1eede3e5197,62a8b46e904..e7626562b6b
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@@ -1728,11 -1727,10 +1728,11 @@@ static void object_apply_location(Objec
    copy_v3_v3(ob->loc, mat[3]);
  }
  
- static void object_orient_to_location(Object *ob,
+ static bool object_orient_to_location(Object *ob,
                                        const float rot_orig[3][3],
                                        const float axis[3],
 -                                      const float location[3])
 +                                      const float location[3],
 +                                      const bool z_flip)
  {
    float delta[3];
    sub_v3_v3v3(delta, ob->obmat[3], location);
@@@ -1985,7 -1975,9 +1986,9 @@@ static int object_transform_axis_target
                  }
  
                  object_orient_to_location(
 -                    item->ob, item->rot_mat, item->rot_mat[2], location_world);
 +                    item->ob, item->rot_mat, item->rot_mat[2], location_world, item->is_z_flip);
+ 
+                 DEG_id_tag_update(&item->ob->id, ID_RECALC_TRANSFORM);
                  WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
                }
                if (normal_found) {
@@@ -1997,9 -1989,11 +2000,11 @@@
            else {
              struct XFormAxisItem *item = xfd->object_data;
              for (int i = 0; i < xfd->object_data_len; i++, item++) {
-               object_orient_to_location(
-                   item->ob, item->rot_mat, item->rot_mat[2], location_world, item->is_z_flip);
-               WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
+               if (object_orient_to_location(
 -                      item->ob, item->rot_mat, item->rot_mat[2], location_world)) {
++                      item->ob, item->rot_mat, item->rot_mat[2], location_world, item->is_z_flip)) {
+                 DEG_id_tag_update(&item->ob->id, ID_RECALC_TRANSFORM);
+                 WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
+               }
              }
              xfd->prev.is_normal_valid = false;
            }