kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #30326: calling e.g. bpy.ops.object.proxy_make(object = 'Lamp') would

Browse Source 
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.
This commit is contained in:
Brecht Van Lommel 2012-02-23 20:31:51 +00:00
parent 0cf38faea4
commit d7155295bb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/object/object_relations.c
View File

@ -321,7 +321,7 @@ static int make_proxy_exec (bContext *C, wmOperator *op)
if (gob->dup_group != NULL) 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; ob= go->ob;
} }
else else
@ -411,8 +411,7 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */ /* 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, "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 */
prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Type", "Group object"); /* XXX, relies on hard coded ID at the moment */
RNA_def_enum_funcs(prop, proxy_group_object_itemf); RNA_def_enum_funcs(prop, proxy_group_object_itemf);
ot->prop= prop; ot->prop= prop;
} }