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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-16 12:38:50 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-16 16:33:20 +0300
commit0ca9ce21abf03d8fd92d5c5f499af59adfa21058 (patch)
treee5bcd61c53a55d220a1f1f58159409ef05b00324
parent11175eb8a8422e37ac1e2646b49cfbfdf6f758e4 (diff)
Fix T63641: transform snap invert keymap item has an effect when disabled.
-rw-r--r--source/blender/editors/transform/transform.c4
1 files changed, 4 insertions, 0 deletions
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) ||