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

[Antonio Vazquez]

Commit: d3afa146470e501dfe49af50228ec1863abf7925
Author: Antonio Vazquez
Date:   Mon Jul 9 17:17:05 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd3afa146470e501dfe49af50228ec1863abf7925

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/space_view3d.py

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index a89ec20862e,c905dc51b0e..9df1a4ec9cf
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3733,6 -3689,52 +3725,53 @@@ class VIEW3D_PT_view3d_cursor(Panel)
          layout.column().prop(view, "cursor_location", text="Location")
  
  
+ class VIEW3D_PT_object_type_visibility(Panel):
+     bl_space_type = 'VIEW_3D'
+     bl_region_type = 'UI'
+     bl_label = "View Object Types"
+     bl_options = {'DEFAULT_CLOSED'}
+ 
+     def draw(self, context):
+         layout = self.layout
+         view = context.space_data
+ 
+         col = layout.column()
+ 
+         split = col.split()
+ 
+         heading_pair = ("Visible", "Selectable")
+         attr_object_types = (
+             "mesh",
+             "curve",
+             "surf",
+             "meta",
+             "font",
+             "armature",
+             "lattice",
+             "empty",
++		    "grease_pencil",
+             "camera",
+             "lamp",
+             "light_probe",
+             "speaker",
+         )
+ 
+         attr_vis = [f"show_object_viewport_{attr}" for attr in attr_object_types]
+         attr_sel = [f"show_object_select_{attr}" for attr in attr_object_types]
+ 
+         sub = split.column()
+         sub.label("Visible")
+         for attr_v in attr_vis:
+             sub.prop(view, attr_v)
+ 
+         sub = split.column()
+         sub.label("Selectable")
+         for attr_v, attr_s in zip(attr_vis, attr_sel):
+             row = sub.row(align=True)
+             row.active = getattr(view, attr_v)
+             row.prop(view, attr_s)
+ 
+ 
  class VIEW3D_PT_shading(Panel):
      bl_space_type = 'VIEW_3D'
      bl_region_type = 'HEADER'
@@@ -4613,8 -4496,9 +4606,9 @@@ classes = 
      VIEW3D_PT_view3d_properties,
      VIEW3D_PT_view3d_camera_lock,
      VIEW3D_PT_view3d_cursor,
+     VIEW3D_PT_object_type_visibility,
 +    VIEW3D_PT_grease_pencil,
 +    VIEW3D_PT_gpencil_multi_frame,
      VIEW3D_PT_quad_view,
      VIEW3D_PT_view3d_stereo,
      VIEW3D_PT_shading,