svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32300:32571soc-2010-nicolasbishop

1 files changed, 31 insertions, 37 deletions

diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index de1b26e987b..48523ec1a5a 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -119,7 +119,7 @@ static int view_pan_init(bContext *C, wmOperator *op)
 }
 
 /* apply transform to view (i.e. adjust 'cur' rect) */
-static void view_pan_apply(bContext *C, wmOperator *op)
+static void view_pan_apply(wmOperator *op)
 {
 	v2dViewPanData *vpd= op->customdata;
 	View2D *v2d= vpd->v2d;
@@ -146,7 +146,6 @@ static void view_pan_apply(bContext *C, wmOperator *op)
 	ED_region_tag_redraw(vpd->ar);
 	
 	UI_view2d_sync(vpd->sc, vpd->sa, v2d, V2D_LOCK_COPY);
-	WM_event_add_mousemove(C);
 	
 	/* exceptions */
 	if (vpd->sa->spacetype==SPACE_OUTLINER) {
@@ -157,7 +156,7 @@ static void view_pan_apply(bContext *C, wmOperator *op)
 }
 
 /* cleanup temp customdata  */
-static void view_pan_exit(bContext *C, wmOperator *op)
+static void view_pan_exit(wmOperator *op)
 {
 	if (op->customdata) {
 		MEM_freeN(op->customdata);
@@ -173,8 +172,8 @@ static int view_pan_exec(bContext *C, wmOperator *op)
 	if (!view_pan_init(C, op))
 		return OPERATOR_CANCELLED;
 	
-	view_pan_apply(C, op);
-	view_pan_exit(C, op);
+	view_pan_apply(op);
+	view_pan_exit(op);
 	return OPERATOR_FINISHED;
 }
 
@@ -200,8 +199,8 @@ static int view_pan_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		RNA_int_set(op->ptr, "deltax", event->prevx - event->x);
 		RNA_int_set(op->ptr, "deltay", event->prevy - event->y);
 		
-		view_pan_apply(C, op);
-		view_pan_exit(C, op);
+		view_pan_apply(op);
+		view_pan_exit(op);
 		return OPERATOR_FINISHED;
 	}
 	
@@ -237,7 +236,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
 			vpd->lastx= event->x;
 			vpd->lasty= event->y;
 			
-			view_pan_apply(C, op);
+			view_pan_apply(op);
 		}
 			break;
 			
@@ -248,7 +247,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
 				RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
 				RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
 				
-				view_pan_exit(C, op);
+				view_pan_exit(op);
 				WM_cursor_restore(CTX_wm_window(C));
 				
 				WM_operator_name_call(C, "VIEW2D_OT_zoom", WM_OP_INVOKE_DEFAULT, NULL);
@@ -261,7 +260,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
 				RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
 				RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
 				
-				view_pan_exit(C, op);
+				view_pan_exit(op);
 				WM_cursor_restore(CTX_wm_window(C));
 				
 				return OPERATOR_FINISHED;
@@ -272,9 +271,9 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-static int view_pan_cancel(bContext *C, wmOperator *op)
+static int view_pan_cancel(bContext *UNUSED(C), wmOperator *op)
 {
-	view_pan_exit(C, op);
+	view_pan_exit(op);
 	return OPERATOR_CANCELLED;
 }
 
@@ -313,7 +312,7 @@ static int view_scrollright_exec(bContext *C, wmOperator *op)
 	/* also, check if can pan in horizontal axis */
 	vpd= op->customdata;
 	if (vpd->v2d->keepofs & V2D_LOCKOFS_X) {
-		view_pan_exit(C, op);
+		view_pan_exit(op);
 		return OPERATOR_PASS_THROUGH;
 	}
 	
@@ -322,8 +321,8 @@ static int view_scrollright_exec(bContext *C, wmOperator *op)
 	RNA_int_set(op->ptr, "deltay", 0);
 	
 	/* apply movement, then we're done */
-	view_pan_apply(C, op);
-	view_pan_exit(C, op);
+	view_pan_apply(op);
+	view_pan_exit(op);
 	
 	return OPERATOR_FINISHED;
 }
@@ -357,7 +356,7 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op)
 	/* also, check if can pan in horizontal axis */
 	vpd= op->customdata;
 	if (vpd->v2d->keepofs & V2D_LOCKOFS_X) {
-		view_pan_exit(C, op);
+		view_pan_exit(op);
 		return OPERATOR_PASS_THROUGH;
 	}
 	
@@ -366,8 +365,8 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op)
 	RNA_int_set(op->ptr, "deltay", 0);
 	
 	/* apply movement, then we're done */
-	view_pan_apply(C, op);
-	view_pan_exit(C, op);
+	view_pan_apply(op);
+	view_pan_exit(op);
 	
 	return OPERATOR_FINISHED;
 }
@@ -400,7 +399,7 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op)
 	/* also, check if can pan in vertical axis */
 	vpd= op->customdata;
 	if (vpd->v2d->keepofs & V2D_LOCKOFS_Y) {
-		view_pan_exit(C, op);
+		view_pan_exit(op);
 		return OPERATOR_PASS_THROUGH;
 	}
 	
@@ -409,8 +408,8 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op)
 	RNA_int_set(op->ptr, "deltay", -40);
 	
 	/* apply movement, then we're done */
-	view_pan_apply(C, op);
-	view_pan_exit(C, op);
+	view_pan_apply(op);
+	view_pan_exit(op);
 	
 	return OPERATOR_FINISHED;
 }
@@ -444,7 +443,7 @@ static int view_scrollup_exec(bContext *C, wmOperator *op)
 	/* also, check if can pan in vertical axis */
 	vpd= op->customdata;
 	if (vpd->v2d->keepofs & V2D_LOCKOFS_Y) {
-		view_pan_exit(C, op);
+		view_pan_exit(op);
 		return OPERATOR_PASS_THROUGH;
 	}
 	
@@ -453,8 +452,8 @@ static int view_scrollup_exec(bContext *C, wmOperator *op)
 	RNA_int_set(op->ptr, "deltay", 40);
 	
 	/* apply movement, then we're done */
-	view_pan_apply(C, op);
-	view_pan_exit(C, op);
+	view_pan_apply(op);
+	view_pan_exit(op);
 	
 	return OPERATOR_FINISHED;
 }
@@ -628,13 +627,12 @@ static void view_zoomstep_apply(bContext *C, wmOperator *op)
 	/* request updates to be done... */
 	ED_region_tag_redraw(vzd->ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
-	WM_event_add_mousemove(C);
 }
 
 /* --------------- Individual Operators ------------------- */
 
 /* cleanup temp customdata  */
-static void view_zoomstep_exit(bContext *C, wmOperator *op)
+static void view_zoomstep_exit(wmOperator *op)
 {
 	if (op->customdata) {
 		MEM_freeN(op->customdata);
@@ -656,7 +654,7 @@ static int view_zoomin_exec(bContext *C, wmOperator *op)
 	/* apply movement, then we're done */
 	view_zoomstep_apply(C, op);
 	
-	view_zoomstep_exit(C, op);
+	view_zoomstep_exit(op);
 	
 	return OPERATOR_FINISHED;
 }
@@ -713,7 +711,7 @@ static int view_zoomout_exec(bContext *C, wmOperator *op)
 	/* apply movement, then we're done */
 	view_zoomstep_apply(C, op);
 
-	view_zoomstep_exit(C, op);
+	view_zoomstep_exit(op);
 	
 	return OPERATOR_FINISHED;
 }
@@ -822,11 +820,10 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
 	/* request updates to be done... */
 	ED_region_tag_redraw(vzd->ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
-	WM_event_add_mousemove(C);
 }
 
 /* cleanup temp customdata  */
-static void view_zoomdrag_exit(bContext *C, wmOperator *op)
+static void view_zoomdrag_exit(wmOperator *op)
 {
 	if (op->customdata) {
 		MEM_freeN(op->customdata);
@@ -841,7 +838,7 @@ static int view_zoomdrag_exec(bContext *C, wmOperator *op)
 		return OPERATOR_PASS_THROUGH;
 	
 	view_zoomdrag_apply(C, op);
-	view_zoomdrag_exit(C, op);
+	view_zoomdrag_exit(op);
 	return OPERATOR_FINISHED;
 }
 
@@ -876,7 +873,7 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		RNA_float_set(op->ptr, "deltay", dy);
 		
 		view_zoomdrag_apply(C, op);
-		view_zoomdrag_exit(C, op);
+		view_zoomdrag_exit(op);
 		return OPERATOR_FINISHED;
 	}	
 	
@@ -988,7 +985,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
 					RNA_float_set(op->ptr, "deltay", 0);
 				
 				/* free customdata */
-				view_zoomdrag_exit(C, op);
+				view_zoomdrag_exit(op);
 				WM_cursor_restore(CTX_wm_window(C));
 				
 				return OPERATOR_FINISHED;
@@ -1095,7 +1092,6 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op)
 	/* request updates to be done... */
 	ED_region_tag_redraw(ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
-	WM_event_add_mousemove(C);
 	
 	return OPERATOR_FINISHED;
 } 
@@ -1355,7 +1351,6 @@ static void scroller_activate_apply(bContext *C, wmOperator *op)
 	/* request updates to be done... */
 	ED_region_tag_redraw(vsm->ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
-	WM_event_add_mousemove(C);
 }
 
 /* handle user input for scrollers - calculations of mouse-movement need to be done here, not in the apply callback! */
@@ -1517,7 +1512,7 @@ void VIEW2D_OT_scroller_activate(wmOperatorType *ot)
 /* ********************************************************* */
 /* RESET */
 
-static int reset_exec(bContext *C, wmOperator *op)
+static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	uiStyle *style= U.uistyles.first;
 	ARegion *ar= CTX_wm_region(C);
@@ -1560,7 +1555,6 @@ static int reset_exec(bContext *C, wmOperator *op)
 	/* request updates to be done... */
 	ED_region_tag_redraw(ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
-	WM_event_add_mousemove(C);
 	
 	return OPERATOR_FINISHED;
 }