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/blenkernel/BKE_main.h | |
| 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/blenkernel/BKE_main.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index ada0761f7d2..7a7f6dfb6f9 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -50,7 +50,7 @@ struct Library; typedef struct Main { struct Main *next, *prev; - char name[240]; + char name[1024]; /* 1024 = FILE_MAX */ short versionfile, subversionfile; short minversionfile, minsubversionfile; int revision; /* svn revision of binary that saved file */ |