diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-25 05:37:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-25 05:45:34 +0300 |
commit | e12f42946f75d0883c17788521ccf7621e28c82c (patch) | |
tree | e576d11f8b1e95981e5aaf9d78640890129c5a79 /source/blender/windowmanager/gizmo | |
parent | 8e812504b4c5408280fc3699d821448f65f17d05 (diff) |
Fix T65092: error with gizmos using freed keymaps
Caused by 5adfc51a0fc7f, sharing keymaps caused changing tools to
unregister gizmos and remove their keymaps.
Workaround for now by not removing the keymap.
Diffstat (limited to 'source/blender/windowmanager/gizmo')
-rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index d4e1dbfac73..95cb86ef3cb 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -921,8 +921,12 @@ void WM_gizmomaptype_group_unlink(bContext *C, WM_gizmomaptype_group_free(gzgt_ref); } + /* TODO(campbell): Gizmos may share keymaps, for now don't + * remove however we could flag them as temporary/owned by the gizmo. */ +#if 0 /* Note, we may want to keep this keymap for editing */ WM_keymap_remove(gzgt->keyconf, gzgt->keymap); +#endif BLI_assert(WM_gizmomaptype_group_find_ptr(gzmap_type, gzgt) == NULL); } |