Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Wed, 20 Feb 2019 14:22:23 +0000 (15:22 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Wed, 20 Feb 2019 14:22:23 +0000 (15:22 +0100)
1  2 
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_python.cpp

index b6751ebc12c196f01f076fccd5ccb0d945e47e0c,5d1d9e764d01f9c35c93c476583f3903a5d8cd71..542f02f1a6dc1219775230d046344bdc7ca51a88
@@@ -1927,8 -1633,7 +1927,7 @@@ class CYCLES_RENDER_PT_debug(CyclesButt
          col.separator()
  
          col = layout.column()
-         col.label(text="OpenCL Flags:")
-         col.prop(cscene, "debug_opencl_kernel_type", text="Kernel")
 -        col.label('OpenCL Flags:')
++        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")