[Bf-blender-cvs] [3b34bc96ca3] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Joshua Leung]

Commit: 3b34bc96ca3bbfffa30117529289fbe53533ec5e
Author: Joshua Leung
Date:   Wed Jun 27 18:25:38 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB3b34bc96ca3bbfffa30117529289fbe53533ec5e

Merge branch 'blender2.8' into greasepencil-object

# Conflicts:
#	source/blender/editors/gpencil/gpencil_interpolate.c
#	source/blender/editors/gpencil/gpencil_paint.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_brush.c
index 43dec78e749,5eb3321b414..588c418dbc7
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@@ -1324,14 -1176,9 +1324,14 @@@ static void gpsculpt_brush_exit(bContex
  	}
  
  	/* disable cursor and headerprints */
- 	ED_area_headerprint(CTX_wm_area(C), NULL);
+ 	ED_workspace_status_text(C, NULL);
  	WM_cursor_modal_restore(win);
 -	gpencil_toggle_brush_cursor(C, false);
 +	if (gso->sa->spacetype != SPACE_VIEW3D) {
 +		ED_gpencil_toggle_brush_cursor(C, false, NULL);
 +	}
 +
 +	/* disable temp invert flag */
 +	gso->brush->flag &= ~GP_EDITBRUSH_FLAG_TMP_INVERT;
  
  	/* free operator data */
  	MEM_freeN(gso);
diff --cc source/blender/editors/gpencil/gpencil_interpolate.c
index 37ad7ef3d36,d7e4be676e5..f31508a602d
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@@ -541,8 -526,7 +541,8 @@@ static int gpencil_interpolate_invoke(b
  	WM_cursor_modal_set(win, BC_EW_SCROLLCURSOR);
  
  	/* update shift indicator in header */
- 	gpencil_interpolate_status_indicators(tgpi);
+ 	gpencil_interpolate_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);
  
  	/* add a modal handler for this operator */
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index ecbb012b29c,800c899f9c2..488d716fab3
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -2356,11 -2047,12 +2356,11 @@@ static void gpencil_draw_status_indicat
  					                                  "ESC/Enter to end  (or click outside this area)"));
  					break;
  				case GP_PAINTMODE_DRAW:
- 					ED_area_headerprint(p->sa, IFACE_("Grease Pencil Freehand Session: Hold and drag LMB to draw"));
 -					ED_workspace_status_text(C, IFACE_("Grease Pencil Freehand Session: Hold and drag LMB to draw | "
 -					                                  "E/ESC/Enter to end  (or click outside this area)"));
++					ED_workspace_status_text(C, IFACE_("Grease Pencil Freehand Session: Hold and drag LMB to draw"));
  					break;
  				case GP_PAINTMODE_DRAW_POLY:
- 					ED_area_headerprint(p->sa, IFACE_("Grease Pencil Poly Session: LMB click to place next stroke vertex | "
+ 					ED_workspace_status_text(C, IFACE_("Grease Pencil Poly Session: LMB click to place next stroke vertex | "
 -					                                  "ESC/Enter to end  (or click outside this area)"));
 +					                                  "Release Shift/ESC/Enter to end  (or click outside this area)"));
  					break;
  
  				default: /* unhandled future cases */