tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.0-release' into main

This commit is contained in:
Germano Cavalcante 2023-10-07 12:12:06 -03:00
parent ce4663403b 4abd59e204
commit 8c1c782853
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/transform/transform.cc
View File

@ -595,24 +595,22 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
}
break;
}
case TFM_MODAL_AXIS_X:
case TFM_MODAL_AXIS_Y:
case TFM_MODAL_AXIS_Z:
case TFM_MODAL_PLANE_X:
case TFM_MODAL_PLANE_Y:
case TFM_MODAL_PLANE_Z:
case TFM_MODAL_AUTOCONSTRAINTPLANE:
if (t->flag & T_2D_EDIT) {
return false;
}
[[fallthrough]];
case TFM_MODAL_AXIS_X:
case TFM_MODAL_AXIS_Y:
case TFM_MODAL_AUTOCONSTRAINT:
case TFM_MODAL_AUTOCONSTRAINTPLANE: {
if (t->flag & T_NO_CONSTRAINT) {
return false;
}
if (!ELEM(value, TFM_MODAL_AXIS_X, TFM_MODAL_AXIS_Y)) {
if (t->flag & T_2D_EDIT) {
return false;
}
}
break;
}
case TFM_MODAL_CONS_OFF: {
if ((t->con.mode & CON_APPLY) == 0) {
return false;