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

[Antonio Vazquez]

Commit: a633737d9396210ce946ab961bd299bed7b1bfe9
Author: Antonio Vazquez
Date:   Tue Jul 17 11:12:00 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa633737d9396210ce946ab961bd299bed7b1bfe9

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 2ec92f4f581,693bb9c4efb..27ff4d78b8b
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3748,9 -3713,8 +3748,9 @@@ class VIEW3D_PT_object_type_visibility(
              "armature",
              "lattice",
              "empty",
 +		    "grease_pencil",
              "camera",
-             "lamp",
+             "light",
              "light_probe",
              "speaker",
          )
diff --cc source/blender/makesrna/intern/rna_space.c
index bebf0882fa9,d7024a149a3..f5e6a7bdd94
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -3178,12 -3098,10 +3178,12 @@@ static void rna_def_space_view3d(Blende
  			 {"show_object_viewport_lattice", "show_object_select_lattice"}},
  			{"Empty", (1 << OB_EMPTY),
  			 {"show_object_viewport_empty", "show_object_select_empty"}},
 +			{"Grease Pencil", (1 << OB_GPENCIL),
 +			 {"show_object_viewport_grease_pencil", "show_object_select_grease_pencil"}},
  			{"Camera", (1 << OB_CAMERA),
  			 {"show_object_viewport_camera", "show_object_select_camera"}},
- 			{"Lamp", (1 << OB_LAMP),
- 			 {"show_object_viewport_lamp", "show_object_select_lamp"}},
+ 			{"Light", (1 << OB_LAMP),
+ 			 {"show_object_viewport_light", "show_object_select_light"}},
  			{"Speaker", (1 << OB_SPEAKER),
  			 {"show_object_viewport_speaker", "show_object_select_speaker"}},
  			{"Light Probe", (1 << OB_LIGHTPROBE),