diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-03 21:48:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-03 21:48:00 +0300 |
| commit | 55aadccbde3a44f9e9a7046f1478e31e2475f60c (patch) | |
| tree | cab220402c0b742b9af330ca02d0ee913a9029c2 /source/blender/windowmanager | |
| parent | 72473a61b0a45cf31a42927e9b86d0f26a25590d (diff) | |
| parent | 103fbb3afc076383b94910e535374c5db398d06c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a11733c060b..ed3cce5fe8a 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -120,7 +120,8 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi) } else { /* zombie keymap item */ - MEM_SAFE_FREE(kmi->ptr); + wm_keymap_item_free(kmi); + kmi->ptr = NULL; } } } |