diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-19 10:05:15 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-19 10:05:15 +0300 |
| commit | 84a5abdb311561ef93a0261f563ca728110b4f3e (patch) | |
| tree | 7f1a01cc505ae9e372b462112a75f9dccf92b04f /intern/cycles/util | |
| parent | eb4acd50648c072ba14dc6a62703434e84ce7cba (diff) | |
| parent | ecd66f69e7b66e8a6ed9b5f39c7dfe272dfbbbed (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_debug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp index 68e6f261057..cd316c46b89 100644 --- a/intern/cycles/util/util_debug.cpp +++ b/intern/cycles/util/util_debug.cpp @@ -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() |