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>2019-02-19 08:13:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-19 08:18:58 +0300
commite617e6395bb94a4ffac04b50996473404761111a (patch)
treef063e080ce2cbcca31934486c896b2f2a0b3cc39
parentbb6692be8a90f7d86d620557a893c6bb48bdd236 (diff)
Cleanup: remove unused default handler type
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c1
-rw-r--r--source/blender/windowmanager/wm_event_system.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 2cb4e10ecd5..766b220fd51 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1745,6 +1745,7 @@ void WM_event_remove_handlers(bContext *C, ListBase *handlers)
/* C is zero on freeing database, modal handlers then already were freed */
while ((handler_base = BLI_pophead(handlers))) {
+ BLI_assert(handler_base->type != 0);
if (handler_base->type == WM_HANDLER_TYPE_OP) {
wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base;
if (handler->op) {
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index 5508e5359e8..d107d009ad1 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -42,8 +42,7 @@ struct wmEventHandler_KeymapFn {
/** Custom types for handlers, for signaling, freeing */
enum eWM_EventHandlerType {
- WM_HANDLER_TYPE_DEFAULT,
- WM_HANDLER_TYPE_GIZMO,
+ WM_HANDLER_TYPE_GIZMO = 1,
WM_HANDLER_TYPE_UI,
WM_HANDLER_TYPE_OP,
WM_HANDLER_TYPE_DROPBOX,