Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-13 15:02:51 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-13 15:02:51 +0400
commit4061f96d94aa410dd8550bb6b3ed8f6f87beb5de (patch)
tree2d2cc9c48cc6eadd5c092b3024980f9d7d475337 /intern/cycles/bvh
parent35629a623ba1fb13db96209a206cc4aedbc9cf9e (diff)
Fix cycles issue with BVH cache created with 64 bits and used for 32 bits binary,
and vice versa.
Diffstat (limited to 'intern/cycles/bvh')
-rw-r--r--intern/cycles/bvh/bvh.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 500b07f755b..f11b3c4c0bc 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -30,6 +30,7 @@
#include "util_foreach.h"
#include "util_map.h"
#include "util_progress.h"
+#include "util_system.h"
#include "util_types.h"
CCL_NAMESPACE_BEGIN
@@ -71,6 +72,7 @@ BVH *BVH::create(const BVHParams& params, const vector<Object*>& objects)
bool BVH::cache_read(CacheData& key)
{
+ key.add(system_cpu_bits());
key.add(&params, sizeof(params));
foreach(Object *ob, objects) {