Revision: 44387
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44387
Author: blendix
Date: 2012-02-23 20:31:51 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Fix #30326: calling e.g. bpy.ops.object.proxy_make(object = 'Lamp') would
not pick the right object. This operator had two properties "object" and
"type", but the latter was used while the former had the right description.
Now changed it to have only an "object" property, so that the above code works.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_relations.c
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c
2012-02-23 20:27:17 UTC (rev 44386)
+++ trunk/blender/source/blender/editors/object/object_relations.c
2012-02-23 20:31:51 UTC (rev 44387)
@@ -321,7 +321,7 @@
if (gob->dup_group != NULL)
{
- go= BLI_findlink(&gob->dup_group->gobject,
RNA_enum_get(op->ptr, "type"));
+ go= BLI_findlink(&gob->dup_group->gobject,
RNA_enum_get(op->ptr, "object"));
ob= go->ob;
}
else
@@ -411,8 +411,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- RNA_def_string(ot->srna, "object", "", MAX_ID_NAME-2, "Proxy Object",
"Name of lib-linked/grouped object to make a proxy for");
- prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Type",
"Group object"); /* XXX, relies on hard coded ID at the moment */
+ prop= RNA_def_enum(ot->srna, "object", DummyRNA_DEFAULT_items, 0,
"Proxy Object", "Name of lib-linked/grouped object to make a proxy for"); /*
XXX, relies on hard coded ID at the moment */
RNA_def_enum_funcs(prop, proxy_group_object_itemf);
ot->prop= prop;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
