blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

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 :/ ).
This commit is contained in:
Bastien Montagne 2015-07-25 10:39:04 +02:00
parent 9939c18900
commit 8cd14d421e
Notes: blender-bot 2023-02-14 08:51:00 +01:00 
Referenced by issue #45553, Object parent_type 'ARMATURE' disappeared in Blender 2.75
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_object.c
View 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);
}