Commit: e4cdda548a582b626f4a42bb702f166178a083e5
Author: Sergey Sharybin
Date: Mon Apr 11 16:18:33 2016 +0200
Branches: master
https://developer.blender.org/rBe4cdda548a582b626f4a42bb702f166178a083e5
Cycles: Remove unused SAH from BVH pack
===================================================================
M intern/cycles/bvh/bvh.cpp
M intern/cycles/bvh/bvh.h
===================================================================
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index b1273d6..9e63485 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -89,15 +89,6 @@ void BVH::build(Progress& progress)
return;
}
- /* compute SAH */
- if(!params.top_level)
- pack.SAH = root->computeSubtreeSAHCost(params);
-
- if(progress.get_cancel()) {
- root->deleteSubtree();
- return;
- }
-
/* pack triangles */
progress.set_substatus("Packing BVH triangles and strands");
pack_primitives();
diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h
index 4b9f1ba..6076c25 100644
--- a/intern/cycles/bvh/bvh.h
+++ b/intern/cycles/bvh/bvh.h
@@ -67,13 +67,9 @@ struct PackedBVH {
/* index of the root node. */
int root_index;
- /* surface area heuristic, for building top level BVH */
- float SAH;
-
PackedBVH()
{
root_index = 0;
- SAH = 0.0f;
}
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
