[Bf-blender-cvs] [52a80cf] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 52a80cfc6b27d8f0d6a1872b1eb2328792259190
Author: Julian Eisel
Date:   Thu Dec 22 02:27:02 2016 +0100
Branches: workspaces
https://developer.blender.org/rB52a80cfc6b27d8f0d6a1872b1eb2328792259190

Merge branch 'blender2.8' into workspaces

Conflicts:
	source/blender/editors/screen/screen_draw.c
	source/blender/editors/screen/screen_edit.c
	source/blender/editors/screen/screen_intern.h

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



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

diff --cc source/blender/makesrna/intern/rna_main_api.c
index 7361a25,d8169e5..46666ea
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@@ -1695,25 -1700,4 +1705,25 @@@ void RNA_def_main_linestyles(BlenderRN
  	RNA_def_property_boolean_funcs(prop, "rna_Main_linestyle_is_updated_get", NULL);
  }
  
 +void RNA_def_main_workspaces(BlenderRNA *brna, PropertyRNA *cprop)
 +{
 +	StructRNA *srna;
 +	FunctionRNA *func;
 +	PropertyRNA *parm;
 +	PropertyRNA *prop;
 +
 +	RNA_def_property_srna(cprop, "BlendDataWorkSpaces");
 +	srna = RNA_def_struct(brna, "BlendDataWorkSpaces", NULL);
 +	RNA_def_struct_sdna(srna, "Main");
 +	RNA_def_struct_ui_text(srna, "Main Workspaces", "Collection of workspaces");
 +
 +	func = RNA_def_function(srna, "tag", "rna_Main_workspaces_tag");
 +	parm = RNA_def_boolean(func, "value", 0, "Value", "");
- 	RNA_def_property_flag(parm, PROP_REQUIRED);
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
 +
 +	prop = RNA_def_property(srna, "is_updated", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 +	RNA_def_property_boolean_funcs(prop, "rna_Main_workspaces_is_updated_get", NULL);
 +}
 +
  #endif
diff --cc source/blender/makesrna/intern/rna_ui_api.c
index 79863a4,46775af..7adc59f
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@@ -649,11 -649,6 +649,11 @@@ void RNA_api_ui_layout(StructRNA *srna
  	func = RNA_def_function(srna, "template_ID", "uiTemplateID");
  	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
  	api_ui_item_rna_common(func);
 +	parm = RNA_def_pointer(func, "search_data", "AnyType", "", "Data from which to take collection to search in, "
 +	                       "uses main ID collection if not set");
- 	RNA_def_property_flag(parm, PROP_RNAPTR | PROP_NEVER_NULL);
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED | PARM_RNAPTR);
 +	parm = RNA_def_string(func, "search_property", NULL, 0, "", "Identifier of search collection property, "
 +	                      "uses main ID collection if not set");
  	RNA_def_string(func, "new", NULL, 0, "", "Operator identifier to create a new ID block");
  	RNA_def_string(func, "open", NULL, 0, "", "Operator identifier to open a file for creating a new ID block");
  	RNA_def_string(func, "unlink", NULL, 0, "", "Operator identifier to unlink the ID block");
@@@ -661,11 -656,6 +661,11 @@@
  	func = RNA_def_function(srna, "template_ID_preview", "uiTemplateIDPreview");
  	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
  	api_ui_item_rna_common(func);
 +	parm = RNA_def_pointer(func, "search_data", "AnyType", "", "Data from which to take collection to search in, "
 +	                       "uses main ID collection if not set");
- 	RNA_def_property_flag(parm, PROP_RNAPTR | PROP_NEVER_NULL);
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED | PARM_RNAPTR);
 +	parm = RNA_def_string(func, "search_property", NULL, 0, "", "Identifier of search collection property, "
 +	                      "uses main ID collection if not set");
  	RNA_def_string(func, "new", NULL, 0, "", "Operator identifier to create a new ID block");
  	RNA_def_string(func, "open", NULL, 0, "", "Operator identifier to open a file for creating a new ID block");
  	RNA_def_string(func, "unlink", NULL, 0, "", "Operator identifier to unlink the ID block");
diff --cc source/blender/windowmanager/WM_types.h
index efa22e6,f51b6b2..f464e2a
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@@ -258,7 -258,7 +258,7 @@@ typedef struct wmNotifier 
  #define ND_JOB				(5<<16)
  #define ND_UNDO				(6<<16)
  
- 	/* NC_WORKSPACE screen */
 -	/* NC_SCREEN screen */
++	/* NC_WORKSPACE */
  #define ND_SCREENBROWSE		(1<<16)
  #define ND_SCREENDELETE		(2<<16)
  #define ND_SCREENCAST		(3<<16)