[Bf-blender-cvs] [fca3dbdba5f] blender2.8-workbench: Fixed wrong merge

[Jeroen Bakker]

Commit: fca3dbdba5f26f1be092c76a31f438a538f721c1
Author: Jeroen Bakker
Date:   Wed Apr 25 12:23:44 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rBfca3dbdba5f26f1be092c76a31f438a538f721c1

Fixed wrong merge

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

M	source/blender/makesdna/DNA_view3d_types.h
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index b14b0b30fda..cd45407812a 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -87,7 +87,6 @@ enum {
 
 enum {
 	V3D_OVERLAY_FACE_ORIENTATION = (1 << 0),
-	V3D_OVERLAY_OBJECT_OVERLAP   = (2 << 0),
 };
 
 typedef struct RegionView3D {
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 82be574e5d9..5a4e23699b8 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2289,12 +2289,6 @@ static void rna_def_space_view3d(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Face Orientation", "Show the Face Orientation Overlay");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
 
-	prop = RNA_def_property(srna, "show_object_overlap_overlay", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "overlays", V3D_OVERLAY_OBJECT_OVERLAP);
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Object Overlap", "Show the Object Overlap Overlay");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_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);