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.

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;
 }