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:
authorThomas Dinges <blender@dingto.org>2015-09-24 16:47:27 +0300
committerThomas Dinges <blender@dingto.org>2015-09-24 16:47:27 +0300
commitdfadf18659fc6252b745b83ceb185a55dea4a2c7 (patch)
treeb66ea5d9d0b75b1e0e1b1705a4129601fb33f57d /intern/cycles/bvh/bvh.cpp
parent3804a3660e31163c84a0a10d4f9fa2c596f11bd2 (diff)
Cleanup: Remove some underlying code for the BVH disk cache.
Notes: - There is still some bvh cache code, but that is from the engines initial commit, we might clean this up further or keep it. - Changes in util_cache.h/.c are kept, this might be re-used in the future.
Diffstat (limited to 'intern/cycles/bvh/bvh.cpp')
-rw-r--r--intern/cycles/bvh/bvh.cpp25
1 files changed, 0 insertions, 25 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 350ca16f6e2..c8c885487e4 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -102,7 +102,6 @@ bool BVH::cache_read(CacheData& key)
CacheData value;
if(Cache::global.lookup(key, value)) {
- cache_filename = key.get_filename();
if(!(value.read(pack.root_index) &&
value.read(pack.SAH) &&
@@ -151,26 +150,6 @@ void BVH::cache_write(CacheData& key)
value.add(pack.prim_object);
Cache::global.insert(key, value);
-
- cache_filename = key.get_filename();
-}
-
-void BVH::clear_cache_except()
-{
- set<string> except;
-
- if(!cache_filename.empty())
- except.insert(cache_filename);
-
- foreach(Object *ob, objects) {
- Mesh *mesh = ob->mesh;
- BVH *bvh = mesh->bvh;
-
- if(bvh && !bvh->cache_filename.empty())
- except.insert(bvh->cache_filename);
- }
-
- Cache::global.clear_except("bvh", except);
}
/* Building */
@@ -234,10 +213,6 @@ void BVH::build(Progress& progress)
if(params.use_cache) {
progress.set_substatus("Writing BVH cache");
cache_write(key);
-
- /* clear other bvh files from cache */
- if(params.top_level)
- clear_cache_except();
}
}