Merge branch 'master' into blender2.8

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.h b/source/blender/compositor/intern/COM_SingleThreadedOperation.h
index 82d0b04e064..e0dc06ef733 100644
--- a/source/blender/compositor/intern/COM_SingleThreadedOperation.h
+++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.h
@@ -27,7 +27,7 @@
 class SingleThreadedOperation : public NodeOperation {
 private:
 	MemoryBuffer *m_cachedInstance;
-	
+
 protected:
 	inline bool isCached() {
 		return this->m_cachedInstance != NULL;
@@ -35,17 +35,17 @@ protected:
 
 public:
 	SingleThreadedOperation();
-	
+
 	/**
 	 * the inner loop of this program
 	 */
 	void executePixel(float output[4], int x, int y, void *data);
-	
+
 	/**
 	 * Initialize the execution
 	 */
 	void initExecution();
-	
+
 	/**
 	 * Deinitialize the execution
 	 */
@@ -54,7 +54,7 @@ public:
 	void *initializeTileData(rcti *rect);
 
 	virtual MemoryBuffer *createMemoryBuffer(rcti *rect) = 0;
-	
+
 	int isSingleThreaded() { return true; }
 };
 #endif