diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-15 16:12:19 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-15 16:12:19 +0300 |
commit | 548e6502524f7f3ed068ee073c5d0728eb76e9a6 (patch) | |
tree | c214ad3d6500da3afe7f73a3dffb5a836f6bd930 | |
parent | 2b97ad348cae6258d33e7bc23bb93a3f1cd59fe6 (diff) |
Cycles: Merging of patch from OSX went wrong in the previous change
That's what happens when you can't commit from a system you're making
changes at and someone is behind your back...
Sorry for the noise.
-rw-r--r-- | intern/cycles/device/device_opencl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 19f50fa103a..e559a9fa535 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -140,9 +140,6 @@ bool opencl_kernel_use_split(const string& platform_name, { return true; } - if(platform_name == "Apple" && device_type == CL_DEVICE_TYPE_GPU) { - return true; - } return false; } @@ -160,6 +157,9 @@ bool opencl_device_supported(const string& platform_name, { return true; } + if(platform_name == "Apple" && device_type == CL_DEVICE_TYPE_GPU) { + return true; + } return false; } |