[Bf-blender-cvs] [330633f] master: Fix T40785: "Select Grouped" Pass Index mode is redundant. Revert "Object Select Similar tool now has a Pass Index option."

Lukas Tönne noreply at git.blender.org
Tue Jul 8 16:19:37 CEST 2014


Commit: 330633f063fdba9c950c4e5093a185ca5a8cdaca
Author: Lukas Tönne
Date:   Tue Jul 8 16:18:04 2014 +0200
https://developer.blender.org/rB330633f063fdba9c950c4e5093a185ca5a8cdaca

Fix T40785: "Select Grouped" Pass Index mode is redundant.
Revert "Object Select Similar tool now has a Pass Index option."

This reverts commit 7a6919a74eb08caaf21030c17fe7c2723394a3d6.

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

M	source/blender/editors/object/object_select.c

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

diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 5590d02..847f2e4 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -524,7 +524,6 @@ static EnumPropertyItem prop_select_grouped_types[] = {
 	{11, "PROPERTIES", 0, "Properties", "Game Properties"},
 	{12, "KEYINGSET", 0, "Keying Set", "Objects included in active Keying Set"},
 	{13, "LAMP_TYPE", 0, "Lamp Type", "Matching lamp types"},
-	{14, "PASS_INDEX", 0, "Pass Index", "Matching object pass index"},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -675,20 +674,6 @@ static bool select_similar_lamps(bContext *C, Object *ob)
 	CTX_DATA_END;
 	return changed;
 }
-static bool select_similar_pass_index(bContext *C, Object *ob)
-{
-	bool changed = false;
-
-	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
-	{
-		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
-			ED_base_object_select(base, BA_SELECT);
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-	return changed;
-}
 static bool select_grouped_type(bContext *C, Object *ob)
 {
 	bool changed = false;
@@ -869,8 +854,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 	else if (nr == 11) changed |= select_grouped_gameprops(C, ob);
 	else if (nr == 12) changed |= select_grouped_keyingset(C, ob, op->reports);
 	else if (nr == 13) changed |= select_similar_lamps(C, ob);
-	else if (nr == 14) changed |= select_similar_pass_index(C, ob);
-
+	
 	if (changed) {
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 		return OPERATOR_FINISHED;




More information about the Bf-blender-cvs mailing list