[Bf-blender-cvs] [53ff71725aa] master: Merge branch 'blender-v2.83-release'

[Campbell Barton]

Commit: 53ff71725aa6ee734626de61867a1f4879049e09
Author: Campbell Barton
Date:   Fri Apr 17 18:52:27 2020 +1000
Branches: master
https://developer.blender.org/rB53ff71725aa6ee734626de61867a1f4879049e09

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/editors/object/object_transform.c
index eef8e29640c,7b3955a0cf8..6cc148535c3
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@@ -1975,11 -1974,13 +1985,13 @@@ 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);
                  WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, item->ob);
                }
-               copy_v3_v3(xfd->prev.normal, normal);
-               xfd->prev.is_normal_valid = true;
+               if (normal_found) {
+                 copy_v3_v3(xfd->prev.normal, normal);
+                 xfd->prev.is_normal_valid = true;
+               }
              }
            }
            else {