diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-02-13 20:52:14 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-02-13 20:52:14 +0400 |
| commit | da4711632c729d54dc3d425d905dec926966f79c (patch) | |
| tree | 84b8d1c20493b7d727f1a581232448e13a2fca3c /source/blender/makesdna | |
| parent | 909d64079a228dfa9cccf8ed718efc322a038e7e (diff) | |
Fix for splitting startup and userpref:
The do-version handling for Userdef is outside file reading, which makes
it needed to store the file version in UserDef, so it gets the correct
version to handle.
Thanks Antonis R. for pointing at the omission!
Also removed the mindboggling define. If you do such, then make it
like "MAIN_VERSION_OLDER_THAN() or so.
In general version hacking could be limited much better... ask me
before even thinking to add one, most optimal is to do it in a way
it's not depending on a version ever - forward/backward compatible.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 2d8d808198d..cc53caa4c20 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -364,6 +364,9 @@ typedef struct SolidLight { } SolidLight; typedef struct UserDef { + /* UserDef has separate do-version handling, and can be read from other files */ + int versionfile, subversionfile; + int flag, dupflag; int savetime; char tempdir[768]; /* FILE_MAXDIR length */ |