diff options
Diffstat (limited to 'intern/cycles/render/mesh.cpp')
-rw-r--r-- | intern/cycles/render/mesh.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 6137f7d4fdc..815ecb310f4 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ #include "bvh.h" @@ -30,6 +30,7 @@ #include "util_cache.h" #include "util_foreach.h" +#include "util_logging.h" #include "util_progress.h" #include "util_set.h" @@ -980,6 +981,9 @@ void MeshManager::device_update_bvh(Device *device, DeviceScene *dscene, Scene * /* bvh build */ progress.set_status("Updating Scene BVH", "Building"); + VLOG(1) << (scene->params.use_qbvh ? "Using QBVH optimization structure" + : "Using regular BVH optimization structure"); + BVHParams bparams; bparams.top_level = true; bparams.use_qbvh = scene->params.use_qbvh; @@ -1027,6 +1031,7 @@ void MeshManager::device_update_bvh(Device *device, DeviceScene *dscene, Scene * } dscene->data.bvh.root = pack.root_index; + dscene->data.bvh.use_qbvh = scene->params.use_qbvh; } void MeshManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress) @@ -1094,7 +1099,12 @@ void MeshManager::device_update(Device *device, DeviceScene *dscene, Scene *scen foreach(Mesh *mesh, scene->meshes) { if(mesh->need_update) { - pool.push(function_bind(&Mesh::compute_bvh, mesh, &scene->params, &progress, i, num_bvh)); + pool.push(function_bind(&Mesh::compute_bvh, + mesh, + &scene->params, + &progress, + i, + num_bvh)); i++; } } |