diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-25 12:59:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-25 13:06:49 +0300 |
| commit | 50e88740c481a18bde50c710d0406d4d878d65cd (patch) | |
| tree | 3d9b88b825c5a4f9e156a74298d731a022a8c470 /source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c | |
| parent | 9bdd12d884c5130397e67f72caad2770d9524c9a (diff) | |
Fix PyManipulators having keymaps registered twice
Manipulators which are registered before UI initialized would have their
keymaps initalized twice (duplicate keymap items).
Diffstat (limited to 'source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c index c61392b500c..53b0561c127 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c @@ -567,13 +567,18 @@ wmManipulatorGroupTypeRef *WM_manipulatormaptype_group_link_ptr( return wgt_ref; } -void WM_manipulatormaptype_group_init_runtime( - const Main *bmain, wmManipulatorMapType *mmap_type, +void WM_manipulatormaptype_group_init_runtime_keymap( + const Main *bmain, wmManipulatorGroupType *wgt) { /* init keymap - on startup there's an extra call to init keymaps for 'permanent' manipulator-groups */ wm_manipulatorgrouptype_setup_keymap(wgt, ((wmWindowManager *)bmain->wm.first)->defaultconf); +} +void WM_manipulatormaptype_group_init_runtime( + const Main *bmain, wmManipulatorMapType *mmap_type, + wmManipulatorGroupType *wgt) +{ /* now create a manipulator for all existing areas */ for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) { for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { @@ -646,8 +651,13 @@ void WM_manipulatormaptype_group_unlink( void wm_manipulatorgrouptype_setup_keymap( wmManipulatorGroupType *wgt, wmKeyConfig *keyconf) { - wgt->keymap = wgt->setup_keymap(wgt, keyconf); - wgt->keyconf = keyconf; + /* Use flag since setup_keymap may return NULL, + * in that case we better not keep calling it. */ + if (wgt->type_update_flag & WM_MANIPULATORMAPTYPE_KEYMAP_INIT) { + wgt->keymap = wgt->setup_keymap(wgt, keyconf); + wgt->keyconf = keyconf; + wgt->type_update_flag &= ~WM_MANIPULATORMAPTYPE_KEYMAP_INIT; + } } /** \} */ /* wmManipulatorGroupType */ |