Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Tue, 19 Feb 2019 07:05:15 +0000 (08:05 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Tue, 19 Feb 2019 07:05:15 +0000 (08:05 +0100)
intern/cycles/blender/addon/properties.py
intern/cycles/util/util_debug.cpp

index c14d7014234e8776798718077dedbdbc5359b9fc..1ced509221c8a70a8be8d0706aa2815aa389f0d5 100644 (file)
@@ -723,7 +723,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     debug_opencl_kernel_single_program: BoolProperty(
         name="Single Program",
-        default=True,
+        default=False,
         update=_devices_update_callback,
     )
     del _devices_update_callback
index 68e6f26105736af96964fe802c8917ee53e5c277..cd316c46b89585358a77767750cf1aa6a83da747 100644 (file)
@@ -132,7 +132,7 @@ void DebugFlags::OpenCL::reset()
        }
        /* Initialize other flags from environment variables. */
        debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL);
-       single_program = (getenv("CYCLES_OPENCL_MULTI_PROGRAM") == NULL);
+       single_program = (getenv("CYCLES_OPENCL_SINGLE_PROGRAM") != NULL);
 }
 
 DebugFlags::DebugFlags()