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/makesdna/DNA_fileglobal_types.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/makesdna/DNA_fileglobal_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_fileglobal_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index f0f8fe7d40c..040b55d9eb6 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -48,8 +48,8 @@ typedef struct FileGlobal { struct Scene *curscene; int fileflags; int globalf; - unsigned long build_commit_timestamp; /* commit timestamp from buildinfo */ - char build_hash[12]; /* hash from buildinfo */ + uint64_t build_commit_timestamp; /* commit timestamp from buildinfo */ + char build_hash[16]; /* hash from buildinfo */ /* file path where this was saved, for recover */ char filename[1024]; /* 1024 = FILE_MAX */ } FileGlobal; |