Fix T45553: Object parent_type 'ARMATURE' disappeared in Blender 2.75.
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 25 Jul 2015 08:39:04 +0000 (10:39 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 25 Jul 2015 08:39:04 +0000 (10:39 +0200)
Own stupid mistake in rBb318795c3b3d (ideally we should really not have that kind of ugly hacks :/ ).

source/blender/makesrna/intern/rna_object.c

index 67243d493a2ed9d0b477bf6df4f73f4a203a7643..7e1b0df9ce7d854ee401a4f9a5249dab5da73b37 100644 (file)
@@ -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);
                }