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-12-07 23:36:11 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-12-07 23:36:23 +0300
commitc822f66bb83eaa0baf90ce662375c0b0aefb9dec (patch)
treefadf738b35fe7a790997b8d58c222d38ecb89e0f /source/blender/editors/transform/transform.c
parent29fb12da589eeb3bbc31b81874526208b35334cb (diff)
Fix T83307: Some modal keys of transform operators don't correspond to the expected effect
The transform modes `shrinkfatten` and `seq_slide` have a special way of handling events. They use modal events in a different way than expected. Therefore, this commit adds special event handles for these modes and removes the keymodal tips from the status bar. These effects are already described in the header anyway.
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r--source/blender/editors/transform/transform.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 5969de5b5da..2b56b30be90 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -637,6 +637,14 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
}
break;
}
+ case TFM_MODAL_TRANSLATE:
+ case TFM_MODAL_ROTATE:
+ case TFM_MODAL_RESIZE: {
+ if (!transform_mode_is_changeable(t->mode)) {
+ return false;
+ }
+ break;
+ }
}
return true;
}
@@ -876,11 +884,6 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
}
- else if (t->mode == TFM_SEQ_SLIDE) {
- t->flag ^= T_ALT_TRANSFORM;
- t->redraw |= TREDRAW_HARD;
- handled = true;
- }
else if (transform_mode_is_changeable(t->mode)) {
restoreTransObjects(t);
resetTransModal(t);
@@ -922,11 +925,6 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
}
- else if (t->mode == TFM_SHRINKFATTEN) {
- t->flag ^= T_ALT_TRANSFORM;
- t->redraw |= TREDRAW_HARD;
- handled = true;
- }
else if (transform_mode_is_changeable(t->mode)) {
/* Scale isn't normally very useful after extrude along normals, see T39756 */
if ((t->con.mode & CON_APPLY) && (t->orient[t->orient_curr].type == V3D_ORIENT_NORMAL)) {