[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18361] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 18361
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18361
Author:   ton
Date:     2009-01-06 11:09:39 +0100 (Tue, 06 Jan 2009)

Log Message:
-----------
2.5

Bugfix: WM gesture manager was not assigning gesture to the 
context-defined region, making border select calls from a
header not work.
This fixes Node header option "Border select".

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
    branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_gesture.c

Modified: branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c	2009-01-06 09:42:09 UTC (rev 18360)
+++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c	2009-01-06 10:09:39 UTC (rev 18361)
@@ -185,6 +185,8 @@
 	// allqueue(REDRAWNODE, 0);
 }
 
+#if 0
+/* XXX not used yet, make compiler happy :) */
 static void node_group_alone_cb(bContext *C, void *node_v, void *unused_v)
 {
 	bNode *node= node_v;
@@ -225,6 +227,7 @@
 	}	
 	return 19;
 }
+#endif
 
 static int node_buts_value(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
 {

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c	2009-01-06 09:42:09 UTC (rev 18360)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c	2009-01-06 10:09:39 UTC (rev 18361)
@@ -75,8 +75,7 @@
 	
 	switch(event) {
 		case 1: /* border select */
-			// NODE_FIX_ME border select draws in menu area only :S
-			// WM_operator_name_call(C, "NODE_OT_border_select", WM_OP_INVOKE_REGION_WIN, NULL, NULL);
+			WM_operator_name_call(C, "NODE_OT_border_select", WM_OP_INVOKE_REGION_WIN, NULL, NULL);
 			break;
 		case 2: /* select/deselect all */
 			// XXX node_deselectall(snode, 1);
@@ -587,8 +586,8 @@
 
 static void do_node_viewmenu(bContext *C, void *arg, int event)
 {
-	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
-	ARegion *ar= CTX_wm_region(C);
+//	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+//	ARegion *ar= CTX_wm_region(C);
 	ScrArea *sa= CTX_wm_area(C);
 	
 	switch(event) {

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_gesture.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_gesture.c	2009-01-06 09:42:09 UTC (rev 18360)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_gesture.c	2009-01-06 10:09:39 UTC (rev 18361)
@@ -58,14 +58,14 @@
 {
 	wmGesture *gesture= MEM_callocN(sizeof(wmGesture), "new gesture");
 	wmWindow *window= CTX_wm_window(C);
-	bScreen *screen= CTX_wm_screen(C);
+	ARegion *ar= CTX_wm_region(C);
 	int sx, sy;
 	
 	BLI_addtail(&window->gesture, gesture);
 	
 	gesture->type= type;
 	gesture->event_type= event->type;
-	gesture->swinid= screen->subwinactive;	/* means only in area-region context! */
+	gesture->swinid= ar->swinid;	/* means only in area-region context! */
 	
 	wm_subwindow_getorigin(window, gesture->swinid, &sx, &sy);