Merged changes in the trunk up to revision 48505.

1 files changed, 19 insertions, 13 deletions

diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h
index 9d28f1757db..abfa2b9538a 100644
--- a/source/blender/compositor/operations/COM_SetColorOperation.h
+++ b/source/blender/compositor/operations/COM_SetColorOperation.h
@@ -31,10 +31,10 @@
  */
 class SetColorOperation : public NodeOperation {
 private:
-	float channel1;
-	float channel2;
-	float channel3;
-	float channel4;
+	float m_channel1;
+	float m_channel2;
+	float m_channel3;
+	float m_channel4;
 
 public:
 	/**
@@ -42,15 +42,21 @@ public:
 	 */
 	SetColorOperation();
 
-	const float getChannel1() {return this->channel1;}
-	void setChannel1(float value) {this->channel1 = value;}
-	const float getChannel2() {return this->channel2;}
-	void setChannel2(float value) {this->channel2 = value;}
-	const float getChannel3() {return this->channel3;}
-	void setChannel3(float value) {this->channel3 = value;}
-	const float getChannel4() {return this->channel4;}
-	void setChannel4(float value) {this->channel4 = value;}
-	void setChannels(float value[4]) {this->channel1 = value[0];this->channel2 = value[1];this->channel3 = value[2];this->channel4 = value[3];}
+	const float getChannel1() { return this->m_channel1; }
+	void setChannel1(float value) { this->m_channel1 = value; }
+	const float getChannel2() { return this->m_channel2; }
+	void setChannel2(float value) { this->m_channel2 = value; }
+	const float getChannel3() { return this->m_channel3; }
+	void setChannel3(float value) { this->m_channel3 = value; }
+	const float getChannel4() { return this->m_channel4; }
+	void setChannel4(float value) { this->m_channel4 = value; }
+	void setChannels(float value[4])
+	{
+		this->m_channel1 = value[0];
+		this->m_channel2 = value[1];
+		this->m_channel3 = value[2];
+		this->m_channel4 = value[3];
+	}
 
 	/**
 	 * the inner loop of this program