[Bf-blender-cvs] [d0426a4ed50] blender-v2.91-release: Fix T82777: Some transform modes using incorrect default orientation
Germano Cavalcante
noreply at git.blender.org
Wed Jan 13 15:08:43 CET 2021
Commit: d0426a4ed50862e012e4314e74f50354fed093c2
Author: Germano Cavalcante
Date: Wed Nov 18 09:33:54 2020 -0300
Branches: blender-v2.91-release
https://developer.blender.org/rBd0426a4ed50862e012e4314e74f50354fed093c2
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 60848eb5678..f835d93bf96 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