Revert "Overlay: enable/disable drawing of specific object types."

This reverts commit f7ec70895c78900db8e7db88d3713ebb9aa62730.

1 files changed, 17 insertions, 35 deletions

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 2beb453e069..736bde725ae 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2217,52 +2217,34 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 			break;
 		}
 		case OB_LAMP:
-			if (v3d->overlay.visible_object_types & V3D_OVERLAY_SHOW_LAMP)
-			{
-				DRW_shgroup_lamp(stl, ob, view_layer);
-			}
+			DRW_shgroup_lamp(stl, ob, view_layer);
 			break;
 		case OB_CAMERA:
-			if (v3d->overlay.visible_object_types & V3D_OVERLAY_SHOW_CAMERA)
-			{
-				DRW_shgroup_camera(stl, ob, view_layer);
-			}
+			DRW_shgroup_camera(stl, ob, view_layer);
 			break;
 		case OB_EMPTY:
-			if (v3d->overlay.visible_object_types & V3D_OVERLAY_SHOW_EMPTY)
-			{
-				DRW_shgroup_empty(stl, psl, ob, view_layer);
-			}
+			DRW_shgroup_empty(stl, psl, ob, view_layer);
 			break;
 		case OB_SPEAKER:
-			if (v3d->overlay.visible_object_types & V3D_OVERLAY_SHOW_SPEAKER)
-			{
-				DRW_shgroup_speaker(stl, ob, view_layer);
-			}
+			DRW_shgroup_speaker(stl, ob, view_layer);
 			break;
 		case OB_LIGHTPROBE:
-			if (v3d->overlay.visible_object_types & V3D_OVERLAY_SHOW_LIGHTPROBE)
-			{
-				DRW_shgroup_lightprobe(stl, psl, ob, view_layer);
-			}
+			DRW_shgroup_lightprobe(stl, psl, ob, view_layer);
 			break;
 		case OB_ARMATURE:
 		{
-			if (v3d->overlay.visible_object_types & V3D_OVERLAY_SHOW_ARMATURE)
-			{
-				bArmature *arm = ob->data;
-				if (arm->edbo == NULL) {
-					if (DRW_state_is_select() || !DRW_pose_mode_armature(ob, draw_ctx->obact)) {
-						DRWArmaturePasses passes = {
-						    .bone_solid = psl->bone_solid,
-						    .bone_outline = psl->bone_outline,
-						    .bone_wire = psl->bone_wire,
-						    .bone_envelope = psl->bone_envelope,
-						    .bone_axes = psl->bone_axes,
-						    .relationship_lines = NULL, /* Don't draw relationship lines */
-						};
-						DRW_shgroup_armature_object(ob, view_layer, passes);
-					}
+			bArmature *arm = ob->data;
+			if (arm->edbo == NULL) {
+				if (DRW_state_is_select() || !DRW_pose_mode_armature(ob, draw_ctx->obact)) {
+					DRWArmaturePasses passes = {
+					    .bone_solid = psl->bone_solid,
+					    .bone_outline = psl->bone_outline,
+					    .bone_wire = psl->bone_wire,
+					    .bone_envelope = psl->bone_envelope,
+					    .bone_axes = psl->bone_axes,
+					    .relationship_lines = NULL, /* Don't draw relationship lines */
+					};
+					DRW_shgroup_armature_object(ob, view_layer, passes);
 				}
 			}
 			break;