[Bf-blender-cvs] [20f8130d6f9] master: Fix T82777: Some transform modes using incorrect default orientation

Germano Cavalcante noreply at git.blender.org
Wed Nov 18 15:57:29 CET 2020


Commit: 20f8130d6f905321059200756d18e9fffab60b7f
Author: Germano Cavalcante
Date:   Wed Nov 18 09:33:54 2020 -0300
Branches: master
https://developer.blender.org/rB20f8130d6f905321059200756d18e9fffab60b7f

Fix T82777: Some transform modes using incorrect default orientation

Some modes were always using `"Global"` orientation as the default.

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

M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 8a7ec7a99e9..5b41f6b51bf 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -506,7 +506,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
     short orient_types[3];
     float custom_matrix[3][3];
 
-    short orient_type_default = V3D_ORIENT_GLOBAL;
     short orient_type_scene = V3D_ORIENT_GLOBAL;
     short orient_type_set = V3D_ORIENT_GLOBAL;
     short orient_type_matrix_set = -1;
@@ -520,6 +519,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
       }
     }
 
+    short orient_type_default = orient_type_scene;
+
     if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis_ortho"))) {
       t->orient_axis_ortho = RNA_property_enum_get(op->ptr, prop);
     }
@@ -535,7 +536,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
       orient_type_default = orient_type_set;
     }
     else if (t->con.mode & CON_APPLY) {
-      orient_type_set = orient_type_default = orient_type_scene;
+      orient_type_set = orient_type_scene;
     }
     else {
       if (orient_type_set == orient_type_scene) {



More information about the Bf-blender-cvs mailing list