[Bf-blender-cvs] [6e7c2d2] master: Cycles: Expose QBVH on/off switch to the UI.

[Thomas Dinges]

Commit: 6e7c2d2e432d415ac20bd554728ad5acf6123eb5
Author: Thomas Dinges
Date:   Thu Dec 25 02:19:14 2014 +0100
Branches: master
https://developer.blender.org/rB6e7c2d2e432d415ac20bd554728ad5acf6123eb5

Cycles: Expose QBVH on/off switch to the UI.

We might remove this again in the future, but for testing purposes
during the release cycle, this will be useful.

The setting defaults to QBVH, and can be found in the Performance panel.

===================================================================

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/ui.py
M	intern/cycles/blender/blender_sync.cpp

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 9459b75..0829f1c 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -456,6 +456,11 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 description="Use BVH spatial splits: longer builder time, faster render",
                 default=False,
                 )
+        cls.use_qbvh = BoolProperty(
+                name="Use QBVH",
+                description="Use QBVH acceleration structure",
+                default=True,
+                )
         cls.use_cache = BoolProperty(
                 name="Cache BVH",
                 description="Cache last built BVH to disk for faster re-render if no geometry changed",
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 9b1e20d..52964ca 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -320,6 +320,7 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
 
         col.label(text="Acceleration structure:")
         col.prop(cscene, "debug_use_spatial_splits")
+        col.prop(cscene, "use_qbvh")
 
 
 class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel):
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index f83eb11..2fb2b6d 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -379,7 +379,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background, bo
 		params.persistent_data = false;
 
 	if(is_cpu) {
-		params.use_qbvh = system_cpu_support_sse2();
+		params.use_qbvh = system_cpu_support_sse2() && RNA_boolean_get(&cscene, "use_qbvh");
 	}
 	else {
 		params.use_qbvh = false;