[Bf-blender-cvs] [45b9112] cycles_kernel_split: Cycles kernel split: Make sure task pool is cancelled in device destructor

[Sergey Sharybin]

Commit: 45b91127e19ddee6fc3d4705bb9f5649e3f50525
Author: Sergey Sharybin
Date:   Sat May 9 16:36:47 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB45b91127e19ddee6fc3d4705bb9f5649e3f50525

Cycles kernel split: Make sure task pool is cancelled in device destructor

Also reverted whitespace change compared to master.

===================================================================

M	intern/cycles/device/device_opencl.cpp

===================================================================

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 146d15b..67c748c 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -818,6 +818,7 @@ public:
 
 	~OpenCLDeviceBase()
 	{
+		task_pool.stop();
 
 		if(null_mem)
 			clReleaseMemObject(CL_MEM_PTR(null_mem));
@@ -3337,7 +3338,7 @@ void device_opencl_info(vector<DeviceInfo>& devices)
 	/* get devices */
 	if(clGetPlatformIDs(0, NULL, &num_platforms) != CL_SUCCESS || num_platforms == 0)
 		return;
-
+	
 	platform_ids.resize(num_platforms);
 
 	if(clGetPlatformIDs(num_platforms, &platform_ids[0], NULL) != CL_SUCCESS)