From 8cd14d421edea4efea941a6159ac24779cae007a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 25 Jul 2015 10:39:04 +0200 Subject: 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 :/ ). --- source/blender/makesrna/intern/rna_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender') 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); } -- cgit v1.2.3