[Bf-blender-cvs] [c6b1a931a39] greasepencil-object: Compile fixes after merge

[Joshua Leung]

Commit: c6b1a931a3970aaef1c27d39f71b633b05909447
Author: Joshua Leung
Date:   Wed Jun 27 18:40:11 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rBc6b1a931a3970aaef1c27d39f71b633b05909447

Compile fixes after merge

===================================================================

M	source/blender/editors/gpencil/gpencil_fill.c
M	source/blender/editors/gpencil/gpencil_primitive.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 3886ca64167..e1667104fee 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -909,12 +909,12 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
 /* ----------------------- */
 /* Drawing                 */
 /* Helper: Draw status message while the user is running the operator */
-static void gpencil_fill_status_indicators(tGPDfill *tgpf)
+static void gpencil_fill_status_indicators(bContext *C, tGPDfill *tgpf)
 {
 	char status_str[UI_MAX_DRAW_STR];
 
 	BLI_snprintf(status_str, sizeof(status_str), IFACE_("Fill: ESC/RMB cancel, LMB Fill, Shift Draw on Back"));
-	ED_area_headerprint(tgpf->sa, status_str);
+	ED_workspace_status_text(C, status_str);
 }
 
 /* draw boundary lines to see fill limits */
@@ -1034,7 +1034,7 @@ static void gpencil_fill_exit(bContext *C, wmOperator *op)
 	/* don't assume that operator data exists at all */
 	if (tgpf) {
 		/* clear status message area */
-		ED_area_headerprint(tgpf->sa, NULL);
+		ED_workspace_status_text(C, NULL);
 
 		MEM_SAFE_FREE(tgpf->sbuffer);
 		MEM_SAFE_FREE(tgpf->depth_arr);
@@ -1119,7 +1119,7 @@ static int gpencil_fill_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
 
 	WM_cursor_modal_set(CTX_wm_window(C), BC_PAINTBRUSHCURSOR);
 
-	gpencil_fill_status_indicators(tgpf);
+	gpencil_fill_status_indicators(C, tgpf);
 
 	DEG_id_tag_update(&tgpf->gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GPENCIL | NA_EDITED, NULL);
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 4ceda4e1135..1132a68821e 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -205,7 +205,7 @@ static void gpencil_primitive_draw_3d(const bContext *C, ARegion *UNUSED(ar), vo
 /* ----------------------- */
 
 /* Helper: Draw status message while the user is running the operator */
-static void gpencil_primitive_status_indicators(tGPDprimitive *tgpi)
+static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi)
 {
 	Scene *scene = tgpi->scene;
 	char status_str[UI_MAX_DRAW_STR];
@@ -249,7 +249,7 @@ static void gpencil_primitive_status_indicators(tGPDprimitive *tgpi)
 				         tgpi->bottom[0], tgpi->bottom[1]);
 		}
 	}
-	ED_area_headerprint(tgpi->sa, status_str);
+	ED_workspace_status_text(C, status_str);
 }
 
 /* ----------------------- */
@@ -389,7 +389,7 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
 static void gpencil_primitive_update(bContext *C, wmOperator *op, tGPDprimitive *tgpi)
 {
 	/* update indicator in header */
-	gpencil_primitive_status_indicators(tgpi);
+	gpencil_primitive_status_indicators(C, tgpi);
 	/* apply... */
 	tgpi->type = RNA_enum_get(op->ptr, "type");
 	tgpi->tot_edges = RNA_int_get(op->ptr, "edges");
@@ -413,7 +413,7 @@ static void gpencil_primitive_exit(bContext *C, wmOperator *op)
 		}
 
 		/* clear status message area */
-		ED_area_headerprint(tgpi->sa, NULL);
+		ED_workspace_status_text(C, NULL);
 
 		/* finally, free memory used by temp data */
 		BKE_gpencil_free_strokes(tgpi->gpf);
@@ -508,7 +508,7 @@ static int gpencil_primitive_invoke(bContext *C, wmOperator *op, const wmEvent *
 	WM_cursor_modal_set(win, BC_CROSSCURSOR);
 
 	/* update sindicator in header */
-	gpencil_primitive_status_indicators(tgpi);
+	gpencil_primitive_status_indicators(C, tgpi);
 	DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GPENCIL | NA_EDITED, NULL);
 
@@ -525,7 +525,7 @@ static void gpencil_primitive_done(bContext *C, wmOperator *op, wmWindow *win, t
 	bGPDstroke *gps;
 
 	/* return to normal cursor and header status */
-	ED_area_headerprint(tgpi->sa, NULL);
+	ED_workspace_status_text(C, NULL);
 	WM_cursor_modal_restore(win);
 
 	/* insert keyframes as required... */
@@ -591,7 +591,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
 		case RIGHTMOUSE:
 		{
 			/* return to normal cursor and header status */
-			ED_area_headerprint(tgpi->sa, NULL);
+			ED_workspace_status_text(C, NULL);
 			WM_cursor_modal_restore(win);
 
 			/* clean up temp data */