diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-24 17:03:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-24 17:20:14 +0300 |
| commit | 1b5a690c721e257f4d2b6b0df3ad87c011af121e (patch) | |
| tree | 51baccb732a82d886b2562f34a427d8123731790 /source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c | |
| parent | 33f9b6d0163f72945c3889c6e5ccb75d22a68113 (diff) | |
Fix crash handling manipulator events before drawing
Diffstat (limited to 'source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c index 808051560bc..94064c84701 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c @@ -66,11 +66,6 @@ * * \{ */ -/* wmManipulatorGroup.flag */ -enum { - WM_MANIPULATORGROUP_INITIALIZED = (1 << 2), /* mgroup has been initialized */ -}; - /** * Create a new manipulator-group from \a wgt. */ @@ -179,7 +174,7 @@ void wm_manipulatorgroup_intersectable_manipulators_to_list(const wmManipulatorG void wm_manipulatorgroup_ensure_initialized(wmManipulatorGroup *mgroup, const bContext *C) { /* prepare for first draw */ - if (UNLIKELY((mgroup->init_flag & WM_MANIPULATORGROUP_INITIALIZED) == 0)) { + if (UNLIKELY((mgroup->init_flag & WM_MANIPULATORGROUP_INIT_SETUP) == 0)) { mgroup->type->setup(C, mgroup); /* Not ideal, initialize keymap here, needed for RNA runtime generated manipulators. */ @@ -190,7 +185,7 @@ void wm_manipulatorgroup_ensure_initialized(wmManipulatorGroup *mgroup, const bC BLI_assert(wgt->keymap != NULL); } - mgroup->init_flag |= WM_MANIPULATORGROUP_INITIALIZED; + mgroup->init_flag |= WM_MANIPULATORGROUP_INIT_SETUP; } } |