diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-22 03:01:25 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-22 03:01:25 +0400 |
| commit | 68ae82bb479a79de72cf174763f3244f64e28bb0 (patch) | |
| tree | 159f1f1a8211ff2d2d89a80f94739cc0f0dfe696 /source/blender/makesrna/intern/rna_main.c | |
| parent | 3667cddf1ada28b6964bc9beeb7cce31f04e18a8 (diff) | |
| parent | b95beea539b22baeb68013c4e65fb0455b968890 (diff) | |
Merged changes in the trunk up to revision 43585.
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_main.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 2af4c04d1ce..d5f39dbd28a 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -32,6 +32,8 @@ #include "rna_internal.h" +#include "BKE_utildefines.h" + #ifdef RNA_RUNTIME #include "BKE_main.h" @@ -330,7 +332,7 @@ void RNA_def_main(BlenderRNA *brna) RNA_def_struct_ui_icon(srna, ICON_BLENDER); prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); - RNA_def_property_string_maxlength(prop, 240); + RNA_def_property_string_maxlength(prop, FILE_MAX); RNA_def_property_string_funcs(prop, "rna_Main_filepath_get", "rna_Main_filepath_length", "rna_Main_filepath_set"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Filename", "Path to the .blend file"); |