diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-28 07:18:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-28 07:18:33 +0300 |
| commit | 88174bd22c8798fa5038a3b8d5192e052bfe673e (patch) | |
| tree | 728c5654cf0fb879027b774d5b4bf964ffe543ec /source/blender/imbuf/intern/IMB_anim.h | |
| parent | 7aaede920fd1376fc06edd45c73403f2084a64bc (diff) | |
| parent | 3c852ba0741f794a697f95073b04921e9ff94039 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf/intern/IMB_anim.h')
| -rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index b10ae4f6fe9..c4c4f4405a5 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -99,8 +99,8 @@ struct anim { int curtype; int curposition; /* index 0 = 1e, 1 = 2e, enz. */ int duration; - short frs_sec; - float frs_sec_base; + int frs_sec; + double frs_sec_base; int x, y; /* for number */ |