[Bf-blender-cvs] [f4ba4c6] master: Fix for SeqCache hash ignoring multi-view
Campbell Barton
noreply at git.blender.org
Sat Aug 8 20:55:34 CEST 2015
Commit: f4ba4c6826c8018beaa9fbc820260ca6096d5e22
Author: Campbell Barton
Date: Sun Aug 9 13:46:18 2015 +1000
Branches: master
https://developer.blender.org/rBf4ba4c6826c8018beaa9fbc820260ca6096d5e22
Fix for SeqCache hash ignoring multi-view
Thanks to @chadf for finding
===================================================================
M source/blender/blenkernel/intern/seqcache.c
===================================================================
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index abfc858..435d936 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;
}
More information about the Bf-blender-cvs
mailing list