[Bf-blender-cvs] [e617e6395bb] master: Cleanup: remove unused default handler type

Campbell Barton noreply at git.blender.org
Tue Feb 19 06:26:27 CET 2019


Commit: e617e6395bb94a4ffac04b50996473404761111a
Author: Campbell Barton
Date:   Tue Feb 19 16:13:47 2019 +1100
Branches: master
https://developer.blender.org/rBe617e6395bb94a4ffac04b50996473404761111a

Cleanup: remove unused default handler type

===================================================================

M	source/blender/windowmanager/intern/wm_event_system.c
M	source/blender/windowmanager/wm_event_system.h

===================================================================

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,



More information about the Bf-blender-cvs mailing list