[Bf-blender-cvs] [9c7195789d4] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 9c7195789d4f6c1a4c10cf4cfea96fcd75b703e6
Author: Campbell Barton
Date:   Sat Sep 8 06:03:29 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB9c7195789d4f6c1a4c10cf4cfea96fcd75b703e6

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_screen.c
index 5f199608f65,0a997ca2163..72514984188
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@@ -322,6 -209,17 +322,17 @@@ static void rna_def_area_spaces(Blender
  	RNA_def_property_ui_text(prop, "Active Space", "Space currently being displayed in this area");
  }
  
+ static void rna_def_area_api(StructRNA *srna)
+ {
+ 	FunctionRNA *func;
+ 
+ 	RNA_def_function(srna, "tag_redraw", "ED_area_tag_redraw");
+ 
 -	func = RNA_def_function(srna, "header_text_set", "ED_area_headerprint");
 -	RNA_def_function_ui_description(func, "Set the header text");
++	func = RNA_def_function(srna, "header_text_set", "ED_area_status_text");
++	RNA_def_function_ui_description(func, "Set the header status text");
+ 	RNA_def_string(func, "text", NULL, 0, "Text", "New string for the header, no argument clears the text");
+ }
+ 
  static void rna_def_area(BlenderRNA *brna)
  {
  	StructRNA *srna;