[Bf-blender-cvs] [8cd14d4] master: Fix T45553: Object parent_type 'ARMATURE' disappeared in Blender 2.75.

[Bastien Montagne]

Commit: 8cd14d421edea4efea941a6159ac24779cae007a
Author: Bastien Montagne
Date:   Sat Jul 25 10:39:04 2015 +0200
Branches: master
https://developer.blender.org/rB8cd14d421edea4efea941a6159ac24779cae007a

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 :/ ).

===================================================================

M	source/blender/makesrna/intern/rna_object.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 67243d4..7e1b0df 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);
 		}