Merge branch 'master' into blender2.8

1 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h
index 78d3c66cb5c..fa358f65ddf 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.h
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.h
@@ -42,17 +42,17 @@ private:
 	 * @brief opencl context
 	 */
 	cl_context m_context;
-	
+
 	/**
 	 * @brief opencl device
 	 */
 	cl_device_id m_device;
-	
+
 	/**
 	 * @brief opencl program
 	 */
 	cl_program m_program;
-	
+
 	/**
 	 * @brief opencl command queue
 	 */
@@ -72,8 +72,8 @@ public:
 	 * @param vendorID
 	 */
 	OpenCLDevice(cl_context context, cl_device_id device, cl_program program, cl_int vendorId);
-	
-	
+
+
 	/**
 	 * @brief initialize the device
 	 * During initialization the OpenCL cl_command_queue is created
@@ -81,13 +81,13 @@ public:
 	 * @see queue
 	 */
 	bool initialize();
-	
+
 	/**
 	 * @brief deinitialize the device
 	 * During deintiialization the command queue is cleared
 	 */
 	void deinitialize();
-	
+
 	/**
 	 * @brief execute a WorkPackage
 	 * @param work the WorkPackage to execute