From 4abd59e204e5c47c00d8a074c27d1d8e53a9ca36 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Sat, 7 Oct 2023 12:08:06 -0300 Subject: [PATCH] Fix #113320: 'Automatic Constraint' not working in 2D editors Caused by 586ffcd669 The condition `(t->flag & T_2D_EDIT)` went unnoticed. --- source/blender/editors/transform/transform.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc index 6acb7adf2eb..6edbc4ddf88 100644 --- a/source/blender/editors/transform/transform.cc +++ b/source/blender/editors/transform/transform.cc @@ -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;