[Bf-blender-cvs] [d2f97224b5] render-layers: Remove select by layer operator

[Dalai Felinto]

Commit: d2f97224b57d2120e79c28bdba436c6fed084983
Author: Dalai Felinto
Date:   Mon Jan 16 15:00:21 2017 +0100
Branches: render-layers
https://developer.blender.org/rBd2f97224b57d2120e79c28bdba436c6fed084983

Remove select by layer operator

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/object/object_ops.c
M	source/blender/editors/object/object_select.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3a2bc16b8e..03929d79ca 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -634,7 +634,6 @@ class VIEW3D_MT_select_object(Menu):
         layout.operator("object.select_all", text="Inverse").action = 'INVERT'
         layout.operator("object.select_random", text="Random")
         layout.operator("object.select_mirror", text="Mirror")
-        layout.operator("object.select_by_layer", text="Select All by Layer")
         layout.operator_menu_enum("object.select_by_type", "type", text="Select All by Type...")
         layout.operator("object.select_camera", text="Select Camera")
 
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index ed32b68a8f..3762876ff8 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -92,7 +92,6 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_select_all);
 	WM_operatortype_append(OBJECT_OT_select_same_group);
 	WM_operatortype_append(OBJECT_OT_select_by_type);
-	WM_operatortype_append(OBJECT_OT_select_by_layer);
 	WM_operatortype_append(OBJECT_OT_select_linked);
 	WM_operatortype_append(OBJECT_OT_select_grouped);
 	WM_operatortype_append(OBJECT_OT_select_mirror);
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 80b1a226eb..ee374862a8 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -956,85 +956,6 @@ void OBJECT_OT_select_grouped(wmOperatorType *ot)
 	ot->prop = RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", "");
 }
 
-/************************* Select by Layer **********************/
-enum {
-	OB_SEL_LAYERMATCH_EXACT = 1,
-	OB_SEL_LAYERMATCH_SHARED = 2,
-};
-
-static int object_select_by_layer_exec(bContext *C, wmOperator *op)
-{
-	unsigned int layernum;
-	bool extend;
-	int match;
-	
-	extend = RNA_boolean_get(op->ptr, "extend");
-	layernum = RNA_int_get(op->ptr, "layers");
-	match = RNA_enum_get(op->ptr, "match");
-	
-	if (extend == false) {
-		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
-		{
-			ED_base_object_select(base, BA_DESELECT);
-		}
-		CTX_DATA_END;
-	}
-		
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
-	{
-		bool ok = false;
-
-		switch (match) {
-			case OB_SEL_LAYERMATCH_EXACT:
-				/* Mask out bits used for local view, only work on real layer ones, see T45783. */
-				ok = ((base->lay & ((1 << 20) - 1)) == (1 << (layernum - 1)));
-				break;
-			case OB_SEL_LAYERMATCH_SHARED:
-				ok = (base->lay & (1 << (layernum - 1))) != 0;
-				break;
-			default:
-				break;
-		}
-
-		if (ok) {
-			ED_base_object_select(base, BA_SELECT);
-		}
-	}
-	CTX_DATA_END;
-	
-	/* undo? */
-	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
-	
-	return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_select_by_layer(wmOperatorType *ot)
-{
-	static EnumPropertyItem match_items[] = {
-		{OB_SEL_LAYERMATCH_EXACT, "EXACT", 0, "Exact Match", ""},
-		{OB_SEL_LAYERMATCH_SHARED, "SHARED", 0, "Shared Layers", ""},
-		{0, NULL, 0, NULL, NULL}
-	};
-
-	/* identifiers */
-	ot->name = "Select by Layer";
-	ot->description = "Select all visible objects on a layer";
-	ot->idname = "OBJECT_OT_select_by_layer";
-	
-	/* api callbacks */
-	/*ot->invoke = XXX - need a int grid popup*/
-	ot->exec = object_select_by_layer_exec;
-	ot->poll = objects_selectable_poll;
-	
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-	
-	/* properties */
-	RNA_def_enum(ot->srna, "match", match_items, OB_SEL_LAYERMATCH_EXACT, "Match", "");
-	RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend selection instead of deselecting everything first");
-	RNA_def_int(ot->srna, "layers", 1, 1, 20, "Layer", "", 1, 20);
-}
-
 /**************************** (De)select All ****************************/
 
 static int object_select_all_exec(bContext *C, wmOperator *op)