diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-20 17:22:23 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-20 17:22:23 +0300 |
| commit | 8a4cdda3737dd72fe1f3daa8759dce199fa87844 (patch) | |
| tree | 85282e7cb99fdd2d4bfa96c32beb2118f7ec7dd7 /intern/cycles/blender/addon/ui.py | |
| parent | 9315cc443b1db112ca7507765e64034fdc539177 (diff) | |
| parent | 949ab753bb2e2d0f76921ed6d716f074ce863f21 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index b6751ebc12c..542f02f1a6d 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1927,8 +1927,7 @@ class CYCLES_RENDER_PT_debug(CyclesButtonsPanel, Panel): col.separator() col = layout.column() - col.label(text="OpenCL Flags:") - col.prop(cscene, "debug_opencl_kernel_type", text="Kernel") + 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") |