diff options
| author | Germano Cavalcante <mano-wii> | 2022-01-11 16:05:41 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2022-01-11 16:05:41 +0300 |
| commit | 5c6418b0778854a8d22e2a8718035b86e4edb603 (patch) | |
| tree | 1b9f3ccfa507ef07278dbd20ddb96358b4f9d23c /source/blender/editors | |
| parent | 2926f10ffe020a010fca3a6b9b735f475a9e2d9f (diff) | |
Fix T94109: 3d cursor crash when using shortcut
Operator was erroneously starting edge_slide operation.
Revert part of the changes in rB3fab16fe8eb4 as obedit_type was being
confused with object_mode.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 0fd35afb292..228a2223fe8 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -863,7 +863,8 @@ int transformEvent(TransInfo *t, const wmEvent *event) case TFM_MODAL_TRANSLATE: /* only switch when... */ if (t->mode == TFM_TRANSLATION) { - if ((t->obedit_type == OB_MESH) && (t->spacetype == SPACE_VIEW3D)) { + if (!(t->options & (CTX_CURSOR | CTX_TEXTURE_SPACE)) && (t->obedit_type == OB_MESH) && + (t->spacetype == SPACE_VIEW3D)) { restoreTransObjects(t); resetTransModal(t); resetTransRestrictions(t); |