diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 19:31:55 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 19:31:55 +0300 |
| commit | 34859b285aff14b022c9b175fa2babfff7c63314 (patch) | |
| tree | a07bfadfa50a516af32ee9ef6fdc0c68302c55fb /source/blender/makesdna | |
| parent | 405980b1facff4a76e3661a412eab1d072d0236f (diff) | |
| parent | 6099b2620d645f4129c42af2272cb6bd8538fc7a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_cachefile_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_cachefile_types.h b/source/blender/makesdna/DNA_cachefile_types.h index a353c94ae64..c0e662d8a48 100644 --- a/source/blender/makesdna/DNA_cachefile_types.h +++ b/source/blender/makesdna/DNA_cachefile_types.h @@ -75,9 +75,12 @@ typedef struct CacheFile { float scale; float frame; /* The frame/time to lookup in the cache file. */ + float frame_offset; /* The frame offset to subtract. */ short flag; /* Animation flag. */ short draw_flag; + + char padding[4]; } CacheFile; #ifdef __cplusplus |