[Bf-blender-cvs] [fe16270fe51] blender2.8-workbench: Merge branch 'blender2.8' into blender2.8-workbench

[Jeroen Bakker]

Commit: fe16270fe5145eba65d1eb725f749b4c90d4cef7
Author: Jeroen Bakker
Date:   Sun Apr 29 18:30:38 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rBfe16270fe5145eba65d1eb725f749b4c90d4cef7

Merge branch 'blender2.8' into blender2.8-workbench

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 6eafd689294,acd87317f0d..dc6e8b7d896
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3531,13 -3583,14 +3583,15 @@@ class VIEW3D_PT_overlay(Panel)
          scene = context.scene
  
          col = layout.column()
-         col.prop(view, "show_only_render")
+         col.prop(overlay, "show_overlays")
+         col.separator()
+ 
          col.prop(view, "show_world")
  
-         if view.viewport_shade == "SOLID":
+         if shading.type == "SOLID":
              col.prop(view, "show_random_object_colors")
              col.prop(view, "show_object_overlap")
 +            col.prop(view, "show_shadows")
  
          if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
              col.prop(view, "show_mode_shade_override")
diff --cc source/blender/makesrna/intern/rna_space.c
index 58e0f5358cc,4cb766b662c..0b9fd99d9f5
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -2299,14 -2348,8 +2348,14 @@@ static void rna_def_space_view3d(Blende
  	RNA_def_property_boolean_sdna(prop, NULL, "drawtype_options", V3D_DRAWOPTION_OBJECT_OVERLAP);
  	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
  	RNA_def_property_ui_text(prop, "Object Overlap", "Show Object Overlap");
- 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
+ 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_3DViewShading_type_update");
  
 +	prop = RNA_def_property(srna, "show_shadows", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_sdna(prop, NULL, "drawtype_options", V3D_DRAWOPTION_SHADOW);
 +	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 +	RNA_def_property_ui_text(prop, "Shadow", "Show Shadow");
 +	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
 +
  	prop = RNA_def_property(srna, "local_view", PROP_POINTER, PROP_NONE);
  	RNA_def_property_pointer_sdna(prop, NULL, "localvd");
  	RNA_def_property_ui_text(prop, "Local View",