diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-09 06:46:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-09 06:53:36 +0300 |
| commit | f4ba4c6826c8018beaa9fbc820260ca6096d5e22 (patch) | |
| tree | f029c6a69522b86d8065f26376f81897ff17b673 /source/blender/blenkernel/intern/seqcache.c | |
| parent | 115c8671902a884a2659c9c60b77fd2bda2696d3 (diff) | |
Fix for SeqCache hash ignoring multi-view
Thanks to @chadf for finding
Diffstat (limited to 'source/blender/blenkernel/intern/seqcache.c')
| -rw-r--r-- | source/blender/blenkernel/intern/seqcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index abfc858fd03..435d9369faa 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -92,8 +92,8 @@ static unsigned int seq_hash_render_data(const SeqRenderData *a) rval ^= ((intptr_t) a->bmain) << 6; rval ^= ((intptr_t) a->scene) << 6; rval ^= (int)(a->motion_blur_shutter * 100.0f) << 10; - rval ^= a->motion_blur_samples << 24; - rval ^= ((a->scene->r.views_format * 2) + a->view_id) << 32; + rval ^= a->motion_blur_samples << 16; + rval ^= ((a->scene->r.views_format * 2) + a->view_id) << 24; return rval; } |