Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-22 20:35:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-22 20:35:48 +0300
commit78a26f28aa50e96ad8db6b70db5e67a33b3acde1 (patch)
tree79dac77818c0a3327effb7ac6a38b3d0a446829b /source/blender/windowmanager/wm_event_system.h
parente6c27b4dabdab84b53d22c893bef8dfbd6335685 (diff)
Fix own error using handler after freeing
Was introduced in e7895bac07f32 Only certain actions caused this, reported as T55155
Diffstat (limited to 'source/blender/windowmanager/wm_event_system.h')
-rw-r--r--source/blender/windowmanager/wm_event_system.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index 7b18ed54c85..3ff853a5576 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -42,6 +42,11 @@ struct ARegion;
/* wmKeyMap is in DNA_windowmanager.h, it's savable */
+struct wmEventHandler_KeymapFn {
+ void (*handle_post_fn)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data);
+ void *user_data;
+};
+
typedef struct wmEventHandler {
struct wmEventHandler *next, *prev;
@@ -52,8 +57,8 @@ typedef struct wmEventHandler {
wmKeyMap *keymap; /* pointer to builtin/custom keymaps */
const rcti *bblocal, *bbwin; /* optional local and windowspace bb */
/* Run after the keymap item runs. */
- void (*keymap_callback)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data);
- void *keymap_callback_user_data;
+ struct wmEventHandler_KeymapFn keymap_callback;
+
struct bToolRef *keymap_tool;
/* modal operator handler */