From 20f8130d6f905321059200756d18e9fffab60b7f Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Wed, 18 Nov 2020 09:33:54 -0300 Subject: Fix T82777: Some transform modes using incorrect default orientation Some modes were always using `"Global"` orientation as the default. --- source/blender/editors/transform/transform_generics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '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) { -- cgit v1.2.3