diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-12-16 19:45:27 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-12-16 19:45:35 +0300 |
commit | 9765ddf4eb1ea0092b96624ee78b8852b5ebe1d1 (patch) | |
tree | 9361226ca473cc9c6f6e2e147fd635b6cd182cef /source/blender/editors/transform/transform_generics.c | |
parent | 0624fad0f3ffa1167c8d807d991aa5788236925b (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/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index c2ff095904d..43d894d60f2 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -214,7 +214,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->flag = 0; - if (obact && ELEM(object_mode, OB_MODE_EDIT, OB_MODE_EDIT_GPENCIL)) { + if (obact && !(t->options & (CTX_CURSOR | CTX_TEXTURE_SPACE)) && + ELEM(object_mode, OB_MODE_EDIT, OB_MODE_EDIT_GPENCIL)) { t->obedit_type = obact->type; } else { |