[Bf-blender-cvs] [50b67d83a9e] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 50b67d83a9eb2f19fe3ed09efa99a253ea9ec136
Author: Bastien Montagne
Date:   Wed May 10 20:40:31 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB50b67d83a9eb2f19fe3ed09efa99a253ea9ec136

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/makesrna/intern/rna_space.c

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



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

diff --cc source/blender/makesrna/intern/rna_space.c
index 13ea1e098f7,7bb17adbc5a..ad84da8c619
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -730,8 -728,8 +730,8 @@@ static EnumPropertyItem *rna_SpaceView3
  	RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_SOLID);
  	RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_TEXTURE);
  	RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_MATERIAL);
- 	
+ 
 -	if (type && type->view_draw)
 +	if (type && type->render_to_view)
  		RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_RENDER);
  
  	RNA_enum_item_end(&item, &totitem);
@@@ -1346,12 -1335,11 +1346,12 @@@ static void rna_SpaceDopeSheetEditor_ac
  	}
  }
  
 -static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 +static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), bContext *C, Scene *UNUSED(scene), PointerRNA *ptr)
  {
  	SpaceAction *saction = (SpaceAction *)(ptr->data);
 -	Object *obact = (scene->basact) ? scene->basact->object : NULL;
 +	SceneLayer *sl = CTX_data_scene_layer(C);
 +	Object *obact = OBACT_NEW;
- 	
+ 
  	/* special exceptions for ShapeKey Editor mode */
  	if (saction->mode == SACTCONT_SHAPEKEY) {
  		Key *key = BKE_key_from_object(obact);
@@@ -2112,12 -2100,9 +2112,12 @@@ static void rna_def_space_outliner(Blen
  		{SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display user preference data"},
  		{SO_ID_ORPHANS, "ORPHAN_DATA", 0, "Orphan Data",
  		                "Display data-blocks which are unused and/or will be lost when the file is reloaded"},
 +		{SO_ACT_LAYER, "ACT_LAYER", 0, "Active Render Layer", "Display the collections of the active render layer"},
 +		{SO_COLLECTIONS, "MASTER_COLLECTION", 0, "Master Collection Tree", "Display all collections based on the "
 +		                 "master collection hierarchy"},
  		{0, NULL, 0, NULL, NULL}
  	};
- 	
+ 
  	srna = RNA_def_struct(brna, "SpaceOutliner", "Space");
  	RNA_def_struct_sdna(srna, "SpaceOops");
  	RNA_def_struct_ui_text(srna, "Space Outliner", "Outliner space data");
@@@ -2403,14 -2388,7 +2403,14 @@@ static void rna_def_space_view3d(Blende
  		{ICON_MATCAP_24, "24", ICON_MATCAP_24, "", ""},
  		{0, NULL, 0, NULL, NULL}
  	};
- 	
+ 
 +	static EnumPropertyItem debug_background_items[] = {
 +		{V3D_DEBUG_BACKGROUND_NONE, "NONE", 0, "None", ""},
 +		{V3D_DEBUG_BACKGROUND_GRADIENT, "GRADIENT", 0, "Gradient", ""},
 +		{V3D_DEBUG_BACKGROUND_WORLD, "WORLD", 0, "World", ""},
 +		{0, NULL, 0, NULL, NULL}
 +	};
 +
  	srna = RNA_def_struct(brna, "SpaceView3D", "Space");
  	RNA_def_struct_sdna(srna, "View3D");
  	RNA_def_struct_ui_text(srna, "3D View Space", "3D View space data");
@@@ -3463,17 -3405,15 +3463,17 @@@ static void rna_def_space_dopesheet(Ble
  	RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceDopeSheetEditor_action_set", NULL,
  	                               "rna_Action_actedit_assign_poll");
  	RNA_def_property_ui_text(prop, "Action", "Action displayed and edited in this space");
 +	RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
  	RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, "rna_SpaceDopeSheetEditor_action_update");
- 	
+ 
  	/* mode */
  	prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
  	RNA_def_property_enum_sdna(prop, NULL, "mode");
  	RNA_def_property_enum_items(prop, mode_items);
  	RNA_def_property_ui_text(prop, "Mode", "Editing context being displayed");
 +	RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
  	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_DOPESHEET, "rna_SpaceDopeSheetEditor_mode_update");
- 	
+ 
  	/* display */
  	prop = RNA_def_property(srna, "show_seconds", PROP_BOOLEAN, PROP_NONE);
  	RNA_def_property_boolean_sdna(prop, NULL, "flag", SACTION_DRAWTIME);