[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18223] branches/blender2.5/blender/source /blender/editors/space_node: 2.5 / Nodes

[Nathan Letwory]

Revision: 18223
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18223
Author:   jesterking
Date:     2009-01-01 21:08:57 +0100 (Thu, 01 Jan 2009)

Log Message:
-----------
2.5 / Nodes
* zoom in/out added also as menu entry
* view all operator is now only executed, not invoked.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
    branches/blender2.5/blender/source/blender/editors/space_node/node_state.c

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-01 19:34:41 UTC (rev 18222)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c	2009-01-01 20:08:57 UTC (rev 18223)
@@ -591,12 +591,14 @@
 	ScrArea *sa= CTX_wm_area(C);
 	
 	switch(event) {
-		/* cases 1 and 2 are now handled automagically by View2D code */
 		case 1: /* Zoom in */
+			WM_operator_name_call(C, "View2D_OT_view_zoomin", WM_OP_EXEC_REGION_WIN, NULL);
+			break;
 		case 2: /* View all */
+			WM_operator_name_call(C, "View2D_OT_view_zoomout", WM_OP_EXEC_REGION_WIN, NULL);
 			break;
 		case 3: /* View all */
-			WM_operator_name_call(C, "NODE_OT_fit_all", WM_OP_INVOKE_REGION_WIN, NULL);
+			WM_operator_name_call(C, "NODE_OT_fit_all", WM_OP_EXEC_REGION_WIN, NULL);
 			break;
 		case 4: /* Grease Pencil */
 			// XXX add_blockhandler(sa, NODES_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_state.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_state.c	2009-01-01 19:34:41 UTC (rev 18222)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_state.c	2009-01-01 20:08:57 UTC (rev 18223)
@@ -203,11 +203,6 @@
 	return OPERATOR_FINISHED;
 }
 
-static int node_fit_all_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	return node_fit_all_exec(C, op);
-}
-
 void NODE_OT_fit_all(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -215,6 +210,6 @@
 	ot->idname= "NODE_OT_fit_all";
 	
 	/* api callbacks */
-	ot->invoke= node_fit_all_invoke;
+	ot->exec= node_fit_all_exec;
 	ot->poll= ED_operator_node_active;
 }
\ No newline at end of file