1 files changed, 28 insertions, 27 deletions

diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
index df64b7c8ddc..696c0748d69 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
@@ -27,37 +27,38 @@ extern "C" {
 	#include "RE_pipeline.h"
 }
 
-BlurBaseOperation::BlurBaseOperation(DataType data_type=COM_DT_COLOR) : NodeOperation()
+BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation()
 {
+	/* data_type is almost always COM_DT_COLOR except for alpha-blur */
 	this->addInputSocket(data_type);
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(data_type);
 	this->setComplex(true);
-	this->inputProgram = NULL;
-	this->data = NULL;
-	this->size = 1.0f;
-	this->deleteData = false;
-	this->sizeavailable = false;
+	this->m_inputProgram = NULL;
+	this->m_data = NULL;
+	this->m_size = 1.0f;
+	this->m_deleteData = false;
+	this->m_sizeavailable = false;
 }
 void BlurBaseOperation::initExecution()
 {
-	this->inputProgram = this->getInputSocketReader(0);
-	this->inputSize = this->getInputSocketReader(1);
-	this->data->image_in_width = this->getWidth();
-	this->data->image_in_height = this->getHeight();
-	if (this->data->relative) {
-		switch (this->data->aspect) {
+	this->m_inputProgram = this->getInputSocketReader(0);
+	this->m_inputSize = this->getInputSocketReader(1);
+	this->m_data->image_in_width = this->getWidth();
+	this->m_data->image_in_height = this->getHeight();
+	if (this->m_data->relative) {
+		switch (this->m_data->aspect) {
 			case CMP_NODE_BLUR_ASPECT_NONE:
-				this->data->sizex = (int)(this->data->percentx * 0.01f * this->data->image_in_width);
-				this->data->sizey = (int)(this->data->percenty * 0.01f * this->data->image_in_height);
+				this->m_data->sizex = (int)(this->m_data->percentx * 0.01f * this->m_data->image_in_width);
+				this->m_data->sizey = (int)(this->m_data->percenty * 0.01f * this->m_data->image_in_height);
 				break;
 			case CMP_NODE_BLUR_ASPECT_Y:
-				this->data->sizex = (int)(this->data->percentx * 0.01f * this->data->image_in_width);
-				this->data->sizey = (int)(this->data->percenty * 0.01f * this->data->image_in_width);
+				this->m_data->sizex = (int)(this->m_data->percentx * 0.01f * this->m_data->image_in_width);
+				this->m_data->sizey = (int)(this->m_data->percenty * 0.01f * this->m_data->image_in_width);
 				break;
 			case CMP_NODE_BLUR_ASPECT_X:
-				this->data->sizex = (int)(this->data->percentx * 0.01f * this->data->image_in_height);
-				this->data->sizey = (int)(this->data->percenty * 0.01f * this->data->image_in_height);
+				this->m_data->sizex = (int)(this->m_data->percentx * 0.01f * this->m_data->image_in_height);
+				this->m_data->sizey = (int)(this->m_data->percenty * 0.01f * this->m_data->image_in_height);
 				break;
 		}
 	}
@@ -77,7 +78,7 @@ float *BlurBaseOperation::make_gausstab(int rad)
 
 	sum = 0.0f;
 	for (i = -rad; i <= rad; i++) {
-		val = RE_filter_value(this->data->filtertype, (float)i / (float)rad);
+		val = RE_filter_value(this->m_data->filtertype, (float)i / (float)rad);
 		sum += val;
 		gausstab[i + rad] = val;
 	}
@@ -131,20 +132,20 @@ float *BlurBaseOperation::make_dist_fac_inverse(int rad, int falloff)
 
 void BlurBaseOperation::deinitExecution()
 {
-	this->inputProgram = NULL;
-	this->inputSize = NULL;
-	if (this->deleteData) {
-		delete this->data;
+	this->m_inputProgram = NULL;
+	this->m_inputSize = NULL;
+	if (this->m_deleteData) {
+		delete this->m_data;
 	}
-	this->data = NULL;
+	this->m_data = NULL;
 }
 
 void BlurBaseOperation::updateSize(MemoryBuffer **memoryBuffers)
 {
-	if (!this->sizeavailable) {
+	if (!this->m_sizeavailable) {
 		float result[4];
 		this->getInputSocketReader(1)->read(result, 0, 0, COM_PS_NEAREST, memoryBuffers);
-		this->size = result[0];
-		this->sizeavailable = true;
+		this->m_size = result[0];
+		this->m_sizeavailable = true;
 	}
 }