diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:27:41 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:30:09 +0300 |
| commit | 9d0eac6ba5efe1b3712152c337fb171a771a8921 (patch) | |
| tree | 8d51f1b3800513d37211253cc3f93f6c2a929ca4 /intern/cycles/blender/addon/ui.py | |
| parent | 0c8aa85069fabd20d5f030f016a85ad060839066 (diff) | |
| parent | d3dd3739f6fe1ba640cdcad12d6bf4da6b356c59 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 32a674c3c09..44c39c6a650 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -19,6 +19,7 @@ import bpy from bpy_extras.node_utils import find_node_input from bl_operators.presets import PresetMenu +import _cycles from bpy.types import ( Panel, @@ -636,10 +637,15 @@ class CYCLES_RENDER_PT_performance_acceleration_structure(CyclesButtonsPanel, Pa col = layout.column() + if _cycles.with_embree: + row = col.row() + row.active = use_cpu(context) + row.prop(cscene, "use_bvh_embree") col.prop(cscene, "debug_use_spatial_splits") + col.active = not cscene.use_bvh_embree or not _cycles.with_embree col.prop(cscene, "debug_use_hair_bvh") sub = col.column() - sub.active = not cscene.debug_use_spatial_splits + sub.active = not cscene.debug_use_spatial_splits and not cscene.use_bvh_embree sub.prop(cscene, "debug_bvh_time_steps") |