diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-25 11:39:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-25 11:39:04 +0300 |
| commit | 8cd14d421edea4efea941a6159ac24779cae007a (patch) | |
| tree | 2ff320609ff26a278153fc665e5cb61259ed696f /source/blender/makesrna/intern/rna_object.c | |
| parent | 9939c189001566e1cfdbb09ecffdec177920b31a (diff) | |
Fix T45553: Object parent_type 'ARMATURE' disappeared in Blender 2.75.
Own stupid mistake in rBb318795c3b3d (ideally we should really not have that kind of ugly hacks :/ ).
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 67243d493a2..7e1b0df9ce7 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -467,11 +467,11 @@ static EnumPropertyItem *rna_Object_parent_type_itemf(bContext *UNUSED(C), Point if (par->type == OB_LATTICE) { /* special hack: prevents this overriding others */ - RNA_enum_items_add_value(&item, &totitem, &parent_type_items[4], PARSKEL); + RNA_enum_items_add_value(&item, &totitem, &parent_type_items[2], PARSKEL); } else if (par->type == OB_ARMATURE) { /* special hack: prevents this being overrided */ - RNA_enum_items_add_value(&item, &totitem, &parent_type_items[3], PARSKEL); + RNA_enum_items_add_value(&item, &totitem, &parent_type_items[1], PARSKEL); RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARBONE); } |