Merge branch 'master' into blender2.8

1 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
index ceba2a85da0..47f9f20f393 100644
--- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
@@ -35,17 +35,17 @@ private:
 	 * Cached reference to the inputProgram
 	 */
 	SocketReader *m_inputOperation;
-	
+
 	/**
 	 * @brief color profile where to convert from
 	 */
 	int m_fromProfile;
-	
+
 	/**
 	 * @brief color profile where to convert to
 	 */
 	int m_toProfile;
-	
+
 	/**
 	 * @brief is color predivided
 	 */
@@ -55,22 +55,22 @@ public:
 	 * Default constructor
 	 */
 	ConvertColorProfileOperation();
-	
+
 	/**
 	 * the inner loop of this program
 	 */
 	void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
-	
+
 	/**
 	 * Initialize the execution
 	 */
 	void initExecution();
-	
+
 	/**
 	 * Deinitialize the execution
 	 */
 	void deinitExecution();
-	
+
 	void setFromColorProfile(int colorProfile) { this->m_fromProfile = colorProfile; }
 	void setToColorProfile(int colorProfile) { this->m_toProfile = colorProfile; }
 	void setPredivided(bool predivided) { this->m_predivided = predivided; }