Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-05-11 19:43:29 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-05-11 19:43:29 +0300
commitb026965f80c7e1beabbf4310af83af66c5b04e45 (patch)
tree52f652b8ee64f19df74c2510d16325f05c9d5713 /source/blender/editors/transform/transform_generics.c
parent508124b5bea44a8a473da02dd23ad492ef276708 (diff)
Revert "Fix T76504: Change in behavior of constraints orientation"
This reverts commit 2f63e479313332756d0879b841527a31fa1d30b3.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 23f1295db3e..300186e2ecb 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1719,21 +1719,13 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
}
t->orientation.types[0] = orient_type_default;
+ t->orientation.types[1] = orient_type_constraint;
+ t->orientation.types[2] = orient_type_constraint != V3D_ORIENT_GLOBAL ? V3D_ORIENT_GLOBAL :
+ V3D_ORIENT_LOCAL;
t->orientation.custom = custom_orientation;
- /* To keep the old behavior logic to init contraint orientarions became this: */
- t->orientation.types[1] = V3D_ORIENT_GLOBAL;
- t->orientation.types[2] = orient_type_constraint != V3D_ORIENT_GLOBAL ?
- orient_type_constraint :
- V3D_ORIENT_LOCAL;
-
if (t->con.mode & CON_APPLY) {
- if (orient_type_constraint == V3D_ORIENT_GLOBAL) {
- t->orientation.index = 1;
- }
- else {
- t->orientation.index = 2;
- }
+ t->orientation.index = 1;
}
}