[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51490] trunk/blender/source/blender/ editors/object: Fix [#32884] select by group not working when active object in more than one group.

Bastien Montagne montagne29 at wanadoo.fr
Mon Oct 22 08:53:54 CEST 2012


Revision: 51490
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51490
Author:   mont29
Date:     2012-10-22 06:53:51 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
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!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_select.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2012-10-22 06:47:54 UTC (rev 51489)
+++ trunk/blender/source/blender/editors/object/object_add.c	2012-10-22 06:53:51 UTC (rev 51490)
@@ -833,8 +833,6 @@
 /* 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 @@
 	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);
 }
 

Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c	2012-10-22 06:47:54 UTC (rev 51489)
+++ trunk/blender/source/blender/editors/object/object_select.c	2012-10-22 06:53:51 UTC (rev 51490)
@@ -608,7 +608,7 @@
 
 	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);




More information about the Bf-blender-cvs mailing list