Commit: 5f3dc592c85b9d1a4acee766c5cc22915234b6d1
Author: Thomas Dinges
Date: Thu Dec 25 12:18:51 2014 +0100
Branches: master
https://developer.blender.org/rB5f3dc592c85b9d1a4acee766c5cc22915234b6d1
Revert QBVH switch, after discussion with Sergey.
===================================================================
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 28621dd..b61cc66 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -456,11 +456,6 @@ 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 44f2262..8fd09c3 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -320,8 +320,6 @@ class CyclesRender_PT_performance(CyclesButtonsPanel,
Panel):
col.label(text="Acceleration structure:")
col.prop(cscene, "debug_use_spatial_splits")
- if use_cpu(context):
- 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 0c647c9..d0d0c0b 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() &&
RNA_boolean_get(&cscene, "use_qbvh");
+ params.use_qbvh = system_cpu_support_sse2();
}
else {
params.use_qbvh = false;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
