[Bf-blender-cvs] [1b32fa0ef57] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 1b32fa0ef579d499a3b266e888c0bc4658a81d6f
Author: Antonio Vazquez
Date:   Wed Jul 11 08:34:35 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1b32fa0ef579d499a3b266e888c0bc4658a81d6f

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 1be47549cf9,b484bf08c3b..078be9540ed
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3932,9 -3891,9 +3928,10 @@@ class VIEW3D_PT_overlay(Panel)
          sub.prop(overlay, "show_relationship_lines")
          sub.prop(overlay, "show_motion_paths")
          #sub.prop(overlay, "show_onion_skins")
 +        sub.prop(context.space_data, "show_annotation", text="Annotations")
          sub.prop(overlay, "show_face_orientation")
          sub.prop(overlay, "show_backface_culling")
+         sub.prop(overlay, "show_ornaments", text="Ornaments")
          sub.prop(overlay, "show_bones", text="Bones")
          if shading.type == 'MATERIAL':
              sub.prop(overlay, "show_look_dev")
diff --cc source/blender/draw/modes/object_mode.c
index 881dc3b5db1,0726c3660d5..62ae9e0c12e
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@@ -2236,15 -2234,21 +2249,24 @@@ static void OBJECT_cache_populate(void 
  			DRW_shgroup_lamp(stl, ob, view_layer);
  			break;
  		case OB_CAMERA:
- 			DRW_shgroup_camera(stl, ob, view_layer);
+ 			if (hide_object_extra) {
+ 				break;
+ 			}
+ 			 DRW_shgroup_camera(stl, ob, view_layer);
  			break;
  		case OB_EMPTY:
+ 			if (hide_object_extra) {
+ 				break;
+ 			}
  			DRW_shgroup_empty(stl, psl, ob, view_layer);
  			break;
 +		case OB_GPENCIL:
 +			DRW_shgroup_gpencil(stl, ob, view_layer);
 +			break;
  		case OB_SPEAKER:
+ 			if (hide_object_extra) {
+ 				break;
+ 			}
  			DRW_shgroup_speaker(stl, ob, view_layer);
  			break;
  		case OB_LIGHTPROBE: