Commit: 548e6502524f7f3ed068ee073c5d0728eb76e9a6
Author: Sergey Sharybin
Date: Wed Jul 15 15:12:19 2015 +0200
Branches: master
https://developer.blender.org/rB548e6502524f7f3ed068ee073c5d0728eb76e9a6
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.
===================================================================
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp
b/intern/cycles/device/device_opencl.cpp
index 19f50fa..e559a9f 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
