diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-24 11:02:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-24 11:02:19 +0400 |
| commit | 619a8b6952b63108c95c031683102f45bd049cd4 (patch) | |
| tree | 79090a899322ba47ffe9866a9169f70d81766f46 /source/blender/makesrna/intern/rna_ID.c | |
| parent | 1424a171a464f79073da2a00c2b5bfa66bf00bc4 (diff) | |
bugfix [#24357] Font folder can be specified but is not opened
- open operator was incorrectly checking if the font path was set.
- rna ID editable check was also incorrect, checking the ID name rather then the filename.
- use define FO_BUILTIN_NAME rather then "<builtin>".
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 4321f8aa711..bc803415c7c 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -29,6 +29,7 @@ #include "RNA_define.h" #include "DNA_ID.h" +#include "DNA_vfont_types.h" #include "WM_types.h" @@ -98,7 +99,8 @@ static int rna_ID_name_editable(PointerRNA *ptr) ID *id= (ID*)ptr->data; if (GS(id->name) == ID_VF) { - if (strcmp(id->name+2, "<builtin>")==0) + VFont *vf= (VFont *)id; + if (strcmp(vf->name, FO_BUILTIN_NAME)==0) return 0; } |