[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54526] trunk/blender/intern/cycles: Fix cycles issue with BVH cache created with 64 bits and used for 32 bits binary ,

[Brecht Van Lommel]

Revision: 54526
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54526
Author:   blendix
Date:     2013-02-13 11:02:51 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Fix cycles issue with BVH cache created with 64 bits and used for 32 bits binary,
and vice versa.

Modified Paths:
--------------
    trunk/blender/intern/cycles/bvh/bvh.cpp
    trunk/blender/intern/cycles/util/util_cache.h

Modified: trunk/blender/intern/cycles/bvh/bvh.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh.cpp	2013-02-13 10:38:05 UTC (rev 54525)
+++ trunk/blender/intern/cycles/bvh/bvh.cpp	2013-02-13 11:02:51 UTC (rev 54526)
@@ -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 @@
 
 bool BVH::cache_read(CacheData& key)
 {
+	key.add(system_cpu_bits());
 	key.add(&params, sizeof(params));
 
 	foreach(Object *ob, objects) {

Modified: trunk/blender/intern/cycles/util/util_cache.h
===================================================================
--- trunk/blender/intern/cycles/util/util_cache.h	2013-02-13 10:38:05 UTC (rev 54525)
+++ trunk/blender/intern/cycles/util/util_cache.h	2013-02-13 11:02:51 UTC (rev 54526)
@@ -72,7 +72,7 @@
 		buffers.push_back(buffer);
 	}
 
-	void add(void *data, size_t size)
+	void add(const void *data, size_t size)
 	{
 		if(size) {
 			CacheBuffer buffer(data, size);
@@ -80,19 +80,19 @@
 		}
 	}
 
-	void add(int& data)
+	void add(const int& data)
 	{
 		CacheBuffer buffer(&data, sizeof(int));
 		buffers.push_back(buffer);
 	}
 
-	void add(float& data)
+	void add(const float& data)
 	{
 		CacheBuffer buffer(&data, sizeof(float));
 		buffers.push_back(buffer);
 	}
 
-	void add(size_t& data)
+	void add(const size_t& data)
 	{
 		CacheBuffer buffer(&data, sizeof(size_t));
 		buffers.push_back(buffer);