From 492518f5e4ccc29975b2f376fb87af723f62142f Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 22 Oct 2012 06:53:51 +0000 Subject: Fix [#32884] select by group not working when active object in more than one group. Would have liked to rework this whole area, but it's kind of tricky, so better to first fix that bug! --- source/blender/editors/object/object_add.c | 7 ++----- source/blender/editors/object/object_select.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/editors/object') diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 029b27c0400..b0e6bd63313 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -833,8 +833,6 @@ static int group_instance_add_exec(bContext *C, wmOperator *op) /* only used as menu */ void OBJECT_OT_group_instance_add(wmOperatorType *ot) { - PropertyRNA *prop; - /* identifiers */ ot->name = "Add Group Instance"; ot->description = "Add a dupligroup instance"; @@ -849,9 +847,8 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); - RNA_def_enum_funcs(prop, RNA_group_itemf); - ot->prop = prop; + ot->prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); + RNA_def_enum_funcs(ot->prop, RNA_group_itemf); ED_object_add_generic_props(ot, FALSE); } diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 1388ce6115e..687ce35f6d7 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -608,7 +608,7 @@ static short select_grouped_group(bContext *C, Object *ob) /* Select objects in for (i = 0; i < group_count; i++) { group = ob_groups[i]; - uiItemStringO(layout, group->id.name + 2, 0, "OBJECT_OT_select_same_group", "group", group->id.name); + uiItemStringO(layout, group->id.name + 2, 0, "OBJECT_OT_select_same_group", "group", group->id.name + 2); } uiPupMenuEnd(C, pup); -- cgit v1.2.3