[Bf-blender-cvs] [5c6418b0778] blender-v2.93-release: Fix T94109: 3d cursor crash when using shortcut
Germano Cavalcante
noreply at git.blender.org
Tue Jan 11 16:00:21 CET 2022
Commit: 5c6418b0778854a8d22e2a8718035b86e4edb603
Author: Germano Cavalcante
Date: Tue Jan 11 14:05:41 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB5c6418b0778854a8d22e2a8718035b86e4edb603
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.
===================================================================
M source/blender/editors/transform/transform.c
===================================================================
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);
More information about the Bf-blender-cvs
mailing list