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

[Jeroen Bakker]

Commit: f708cad6b2afefbc72691c6c736fed67879172fb
Author: Jeroen Bakker
Date:   Tue May 1 10:51:54 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rBf708cad6b2afefbc72691c6c736fed67879172fb

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

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index dc6e8b7d896,8ab4bbed91f..81815ed3f91
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3539,6 -3539,10 +3539,11 @@@ class VIEW3D_PT_shading(Panel)
              col.separator()
              col.row().prop(shading, "light", expand=True)
  
+             col.separator()
+             col.prop(shading, "show_random_object_colors")
+             col.prop(shading, "show_object_overlap")
++            col.prop(shading, "show_shadows")
+ 
              if shading.light == 'STUDIO':
                  # TODO: don't store these settings in the scene
                  scene = context.scene
diff --cc source/blender/makesrna/intern/rna_space.c
index 502b9d0b109,f3e78b4ec41..0c26cac8b6f
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -2203,6 -2203,18 +2203,24 @@@ static void rna_def_space_view3d_shadin
  	RNA_def_property_enum_items(prop, rna_enum_viewport_lighting_items);
  	RNA_def_property_ui_text(prop, "Lighting", "Lighting Method for Solid/Texture Viewport Shading");
  	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_3DViewShading_type_update");
+ 
+ 	prop = RNA_def_property(srna, "show_object_overlap", PROP_BOOLEAN, PROP_NONE);
+ 	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_3DViewShading_type_update");
+ 
+ 	prop = RNA_def_property(srna, "show_random_object_colors", PROP_BOOLEAN, PROP_NONE);
+ 	RNA_def_property_boolean_sdna(prop, NULL, "drawtype_options", V3D_DRAWOPTION_RANDOMIZE);
+ 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+ 	RNA_def_property_ui_text(prop, "Random Colors", "Show random object colors");
+ 	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_3DViewShading_type_update");
  }
  
  static void rna_def_space_view3d_overlay(BlenderRNA *brna)