diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-18 16:13:23 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-18 16:13:23 +0400 |
| commit | 53753c0ddc947aa74246492fb76466198a28db58 (patch) | |
| tree | 26d54a6b7489815d5baeaeba2e6f87fb3f8698d6 /source/blender/blenkernel/BKE_main.h | |
| parent | 2b0162b6226df9dcb9b6819ce93f2d434afc69c4 (diff) | |
Fix T37488: Crash with --debug reading userpref.blend
Issue was in fact caused by wrong DNA storage, which
apparently was considering unsigned long as just 4
bytes here.
Now use uint64_t to be sure timestamp does fit into
storage on all the platforms.
Thanks Campbell for help looking in the issue.
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 629eda3b583..7b7b69034a9 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -53,7 +53,7 @@ typedef struct Main { char name[1024]; /* 1024 = FILE_MAX */ short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION */ short minversionfile, minsubversionfile; - unsigned long build_commit_timestamp; /* commit's timestamp from buildinfo */ + uint64_t build_commit_timestamp; /* commit's timestamp from buildinfo */ char build_hash[16]; /* hash from buildinfo */ short recovered; /* indicate the main->name (file) is the recovered one */ |