diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
| commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
| tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/makesrna/intern/rna_object.c | |
| parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
| parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index bc8c914de94..9d49a1c242f 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -481,7 +481,7 @@ static const EnumPropertyItem *rna_Object_parent_type_itemf(bContext *UNUSED(C), RNA_enum_items_add_value(&item, &totitem, &parent_type_items[2], PARSKEL); } else if (par->type == OB_ARMATURE) { - /* special hack: prevents this being overrided */ + /* special hack: prevents this being overridden */ RNA_enum_items_add_value(&item, &totitem, &parent_type_items[1], PARSKEL); RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARBONE); } |