diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-30 21:46:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-30 21:47:24 +0300 |
| commit | 0467443930417f92f2dadc5dc63db4bfeb6ea5f2 (patch) | |
| tree | 1c566fdda67b5b9054c501dec384f0941bf21cc6 /source | |
| parent | c90a3af8798e3d2910146a7b5e307a10a0e92f8c (diff) | |
Fix manipulator keymap initialization
Update flag was cleared before being checked
when registering after load.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c index 534bcdbd7f0..d474788caff 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c @@ -83,8 +83,6 @@ static wmManipulatorGroupType *wm_manipulatorgrouptype_append__begin(void) { wmManipulatorGroupType *wgt = MEM_callocN(sizeof(wmManipulatorGroupType), "manipulatorgrouptype"); - wgt->type_update_flag |= WM_MANIPULATORMAPTYPE_KEYMAP_INIT; - return wgt; } static void wm_manipulatorgrouptype_append__end(wmManipulatorGroupType *wgt) @@ -92,6 +90,8 @@ static void wm_manipulatorgrouptype_append__end(wmManipulatorGroupType *wgt) BLI_assert(wgt->name != NULL); BLI_assert(wgt->idname != NULL); + wgt->type_update_flag |= WM_MANIPULATORMAPTYPE_KEYMAP_INIT; + /* if not set, use default */ if (wgt->setup_keymap == NULL) { if (wgt->flag & WM_MANIPULATORGROUPTYPE_SELECT) { diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c index 5b93db88d3b..c0da31fdbdd 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c @@ -1016,13 +1016,13 @@ void WM_manipulatorconfig_update(struct Main *bmain) wgt_ref = wgt_ref->next) { if (wgt_ref->type->type_update_flag & WM_MANIPULATORMAPTYPE_KEYMAP_INIT) { - wgt_ref->type->type_update_flag &= ~WM_MANIPULATORMAPTYPE_KEYMAP_INIT; WM_manipulatormaptype_group_init_runtime_keymap(bmain, wgt_ref->type); + wgt_ref->type->type_update_flag &= ~WM_MANIPULATORMAPTYPE_KEYMAP_INIT; } if (wgt_ref->type->type_update_flag & WM_MANIPULATORMAPTYPE_UPDATE_INIT) { - wgt_ref->type->type_update_flag &= ~WM_MANIPULATORMAPTYPE_UPDATE_INIT; WM_manipulatormaptype_group_init_runtime(bmain, mmap_type, wgt_ref->type); + wgt_ref->type->type_update_flag &= ~WM_MANIPULATORMAPTYPE_UPDATE_INIT; } } } |