[Bf-blender-cvs] [8a4cdda3737] master: Merge branch 'blender2.7'
Jeroen Bakker
noreply at git.blender.org
Wed Feb 20 15:22:28 CET 2019
Commit: 8a4cdda3737dd72fe1f3daa8759dce199fa87844
Author: Jeroen Bakker
Date: Wed Feb 20 15:22:23 2019 +0100
Branches: master
https://developer.blender.org/rB8a4cdda3737dd72fe1f3daa8759dce199fa87844
Merge branch 'blender2.7'
===================================================================
===================================================================
diff --cc intern/cycles/blender/addon/ui.py
index b6751ebc12c,5d1d9e764d0..542f02f1a6d
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -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")
More information about the Bf-blender-cvs
mailing list