[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28105] trunk/blender/source/blender/ editors/screen/area.c: Reversion of commit that changes order for keymaps.

Ton Roosendaal ton at blender.org
Fri Apr 9 15:16:17 CEST 2010


Revision: 28105
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28105
Author:   ton
Date:     2010-04-09 15:16:17 +0200 (Fri, 09 Apr 2010)

Log Message:
-----------
Reversion of commit that changes order for keymaps. I thought it
would work for all cases, but greasepencil broke! Needs to get
a bit more thinking or design.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/area.c

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2010-04-09 10:54:19 UTC (rev 28104)
+++ trunk/blender/source/blender/editors/screen/area.c	2010-04-09 13:16:17 UTC (rev 28105)
@@ -893,22 +893,22 @@
 	rect= sa->totrct;
 	region_rect_recursive(sa, sa->regionbase.first, &rect, 0);
 	
+	/* default area handlers */
+	ed_default_handlers(wm, &sa->handlers, sa->type->keymapflag);
 	/* checks spacedata, adds own handlers */
 	if(sa->type->init)
 		sa->type->init(wm, sa);
-	/* default area handlers */
-	ed_default_handlers(wm, &sa->handlers, sa->type->keymapflag);
 	
 	/* region windows, default and own handlers */
 	for(ar= sa->regionbase.first; ar; ar= ar->next) {
 		region_subwindow(wm, win, ar);
 		
 		if(ar->swinid) {
+			/* default region handlers */
+			ed_default_handlers(wm, &ar->handlers, ar->type->keymapflag);
 			/* own handlers */
 			if(ar->type->init)
 				ar->type->init(wm, ar);
-			/* default region handlers */
-			ed_default_handlers(wm, &ar->handlers, ar->type->keymapflag);
 		}
 		else {
 			/* prevent uiblocks to run */





More information about the Bf-blender-cvs mailing list