diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-25 08:33:21 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-25 08:33:21 +0400 |
| commit | a1c5c501a6b4b8bfdee6f60869c122fb6f321726 (patch) | |
| tree | b2bd0a250560638b3f08627494eeb002e067a8c9 /source/blender/makesrna/intern/rna_define.c | |
| parent | e5f6a41b1b7125a4c3bc7ef2554c04b768ac765c (diff) | |
| parent | 7a357cba3994bee7d05c7a8bf5736eb94067d564 (diff) | |
At last... this merge should finally do the trick!
21073 to 21145
Diffstat (limited to 'source/blender/makesrna/intern/rna_define.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 51c1818eed9..bd449acc050 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -1946,7 +1946,7 @@ PropertyRNA *RNA_def_string_dir_path(StructOrFunctionRNA *cont_, const char *ide return prop; } -PropertyRNA *RNA_def_enum(StructOrFunctionRNA *cont_, const char *identifier, EnumPropertyItem *items, int default_value, +PropertyRNA *RNA_def_enum(StructOrFunctionRNA *cont_, const char *identifier, const EnumPropertyItem *items, int default_value, const char *ui_name, const char *ui_description) { ContainerRNA *cont= cont_; |