diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-12 04:09:57 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-12 04:09:57 +0400 |
| commit | 44e4c5f8316b34835c7900dc649bf8a1570afc0a (patch) | |
| tree | 99027196ffd166c78c336126d36c36bbc1621a29 /source/blender/makesrna/intern/rna_ID.c | |
| parent | 8a340981be174cae842d339f0458ba6b558330c3 (diff) | |
| parent | 0682c3f1aefe315df5fe64ba8c814adacbd739e5 (diff) | |
Merged changes in the trunk up to revision 49797.
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index e007db62f58..4a27761b8d2 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -77,6 +77,7 @@ EnumPropertyItem id_type_items[] = { #ifdef RNA_RUNTIME +#include "BKE_font.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_animsys.h" @@ -110,12 +111,12 @@ static int rna_ID_name_editable(PointerRNA *ptr) ID *id = (ID *)ptr->data; if (GS(id->name) == ID_VF) { - VFont *vf = (VFont *)id; - if (strcmp(vf->name, FO_BUILTIN_NAME) == 0) - return 0; + VFont *vfont = (VFont *)id; + if (BKE_vfont_is_builtin(vfont)) + return FALSE; } - return 1; + return TRUE; } short RNA_type_to_ID_code(StructRNA *type) |