blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Revert "Fix T76504: Change in behavior of constraints orientation" 

This reverts commit 2f63e47931.
This commit is contained in:
Germano Cavalcante 2020-05-11 13:43:29 -03:00
parent 508124b5be
commit b026965f80
Notes: blender-bot 2023-02-13 22:36:32 +01:00 
Referenced by issue #76649, crash  by moving an object with gizmos
Referenced by issue #76504, Extrusion doesn't take in account the current transform orientation
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/transform/transform.c
View File

@ -825,15 +825,11 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, bool is
}
}
else if (!edit_2d) {
if (cmode == axis) {
if (ELEM(cmode, '\0', axis)) {
/* Successive presses on existing axis, cycle orientation modes. */
t->orientation.index = (t->orientation.index + 1) % ARRAY_SIZE(t->orientation.types);
initTransformOrientation(t->context, t, t->orientation.types[t->orientation.index]);
}
else if (t->orientation.index != 1) {
t->orientation.index = 1;
initTransformOrientation(t->context, t, t->orientation.types[t->orientation.index]);
}
if (t->orientation.index == 0) {
stopConstraint(t);

16
source/blender/editors/transform/transform_generics.c
View File

@ -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;
}
}