diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
| commit | 40412499433ef6d8619fd1e8ecaa00addb163721 (patch) | |
| tree | 17f9e5f936237cb4714f5ef0361f09dd0435db92 /intern/cycles/blender/addon/ui.py | |
| parent | ba4d07cc5c74e42445a59bf1e77587cbf4a83482 (diff) | |
| parent | 0a28bb14222c7753a987256a9c155b670137ee37 (diff) | |
Merge branch 'blender2.7'
Conflicts:
intern/cycles/blender/addon/properties.py
intern/cycles/device/opencl/opencl_split.cpp
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index d0cfb5c5e72..93b16727b9a 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1932,7 +1932,6 @@ class CYCLES_RENDER_PT_debug(CyclesButtonsPanel, Panel): col = layout.column() col.label(text='OpenCL Flags:') col.prop(cscene, "debug_opencl_device_type", text="Device") - col.prop(cscene, "debug_opencl_kernel_single_program", text="Single Program") col.prop(cscene, "debug_use_opencl_debug", text="Debug") col.prop(cscene, "debug_opencl_mem_limit") |