Commit: 0ca9ce21abf03d8fd92d5c5f499af59adfa21058
Author: Brecht Van Lommel
Date: Tue Apr 16 11:38:50 2019 +0200
Branches: master
https://developer.blender.org/rB0ca9ce21abf03d8fd92d5c5f499af59adfa21058
Fix T63641: transform snap invert keymap item has an effect when disabled.
===================================================================
M source/blender/editors/transform/transform.c
===================================================================
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index 4135a1b320d..4c53e9dbd4e 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2413,6 +2413,10 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator
*op, const wmEvent *eve
wmKeyMapItem *kmi;
for (kmi = t->keymap->items.first; kmi; kmi =
kmi->next) {
+ if (kmi->flag & KMI_INACTIVE) {
+ continue;
+ }
+
if (kmi->propvalue == TFM_MODAL_SNAP_INV_ON &&
kmi->val == KM_PRESS) {
if ((ELEM(kmi->type, LEFTCTRLKEY,
RIGHTCTRLKEY) && event->ctrl) ||
(ELEM(kmi->type, LEFTSHIFTKEY,
RIGHTSHIFTKEY) && event->shift) ||
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
