[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58382] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: code cleanup: replace wm_macro_modal inline search for BLI_findptr.

Campbell Barton ideasman42 at gmail.com
Fri Jul 19 12:39:55 CEST 2013


Revision: 58382
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58382
Author:   campbellbarton
Date:     2013-07-19 10:39:55 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
code cleanup: replace wm_macro_modal inline search for BLI_findptr.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-07-19 10:39:49 UTC (rev 58381)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-07-19 10:39:55 UTC (rev 58382)
@@ -307,14 +307,9 @@
 			/* if new operator is modal and also added its own handler */
 			if (retval & OPERATOR_RUNNING_MODAL && op->opm != opm) {
 				wmWindow *win = CTX_wm_window(C);
-				wmEventHandler *handler = NULL;
+				wmEventHandler *handler;
 
-				for (handler = win->modalhandlers.first; handler; handler = handler->next) {
-					/* first handler in list is the new one */
-					if (handler->op == op)
-						break;
-				}
-
+				handler = BLI_findptr(&win->modalhandlers, op, offsetof(wmEventHandler, op));
 				if (handler) {
 					BLI_remlink(&win->modalhandlers, handler);
 					wm_event_free_handler(handler);




More information about the Bf-blender-cvs mailing list