diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-23 14:54:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-23 14:54:51 +0300 |
| commit | d0335796a8f1acb8b1a1c2336b382da82e2370ee (patch) | |
| tree | 9052b7941da2d26ad3d974c8da4f563c23575a9e /source/blender/makesdna | |
| parent | 8db2f72997cc72259157d7fc42b54fa5a292f424 (diff) | |
Readfile: Resurrect do_versions_after_liblink.
Basic idea is to store fileversion in Library datablock, and split again
Main by libraries after lib linking, do_versions_after_liblink on
those separated Mains, and merge again.
This allows to still have correct versions for each data-block in that
second do_versions step.
Note that this is not used currently in master (might be soon, though),
but is needed for 2.8 work.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 9a8f3da3396..ed719b66eb3 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -155,8 +155,9 @@ typedef struct Library { struct PackedFile *packedfile; + /* Temp data needed by read/write code. */ int temp_index; - int _pad; + short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION, needed for do_versions */ } Library; enum eIconSizes { |