1 files changed, 28 insertions, 28 deletions

diff --git a/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.cc b/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.cc
index 959f599fab4..9f4ee376fbf 100644
--- a/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.cc
@@ -23,11 +23,11 @@ namespace blender::compositor {
 GaussianBlurBaseOperation::GaussianBlurBaseOperation(eDimension dim)
     : BlurBaseOperation(DataType::Color)
 {
-  m_gausstab = nullptr;
+  gausstab_ = nullptr;
 #ifdef BLI_HAVE_SSE2
-  m_gausstab_sse = nullptr;
+  gausstab_sse_ = nullptr;
 #endif
-  m_filtersize = 0;
+  filtersize_ = 0;
   rad_ = 0.0f;
   dimension_ = dim;
 }
@@ -36,35 +36,35 @@ void GaussianBlurBaseOperation::init_data()
 {
   BlurBaseOperation::init_data();
   if (execution_model_ == eExecutionModel::FullFrame) {
-    rad_ = max_ff(m_size * this->get_blur_size(dimension_), 0.0f);
+    rad_ = max_ff(size_ * this->get_blur_size(dimension_), 0.0f);
     rad_ = min_ff(rad_, MAX_GAUSSTAB_RADIUS);
-    m_filtersize = min_ii(ceil(rad_), MAX_GAUSSTAB_RADIUS);
+    filtersize_ = min_ii(ceil(rad_), MAX_GAUSSTAB_RADIUS);
   }
 }
 
-void GaussianBlurBaseOperation::initExecution()
+void GaussianBlurBaseOperation::init_execution()
 {
-  BlurBaseOperation::initExecution();
+  BlurBaseOperation::init_execution();
   if (execution_model_ == eExecutionModel::FullFrame) {
-    m_gausstab = BlurBaseOperation::make_gausstab(rad_, m_filtersize);
+    gausstab_ = BlurBaseOperation::make_gausstab(rad_, filtersize_);
 #ifdef BLI_HAVE_SSE2
-    m_gausstab_sse = BlurBaseOperation::convert_gausstab_sse(m_gausstab, m_filtersize);
+    gausstab_sse_ = BlurBaseOperation::convert_gausstab_sse(gausstab_, filtersize_);
 #endif
   }
 }
 
-void GaussianBlurBaseOperation::deinitExecution()
+void GaussianBlurBaseOperation::deinit_execution()
 {
-  BlurBaseOperation::deinitExecution();
+  BlurBaseOperation::deinit_execution();
 
-  if (m_gausstab) {
-    MEM_freeN(m_gausstab);
-    m_gausstab = nullptr;
+  if (gausstab_) {
+    MEM_freeN(gausstab_);
+    gausstab_ = nullptr;
   }
 #ifdef BLI_HAVE_SSE2
-  if (m_gausstab_sse) {
-    MEM_freeN(m_gausstab_sse);
-    m_gausstab_sse = nullptr;
+  if (gausstab_sse_) {
+    MEM_freeN(gausstab_sse_);
+    gausstab_sse_ = nullptr;
   }
 #endif
 }
@@ -81,12 +81,12 @@ void GaussianBlurBaseOperation::get_area_of_interest(const int input_idx,
   r_input_area = output_area;
   switch (dimension_) {
     case eDimension::X:
-      r_input_area.xmin = output_area.xmin - m_filtersize - 1;
-      r_input_area.xmax = output_area.xmax + m_filtersize + 1;
+      r_input_area.xmin = output_area.xmin - filtersize_ - 1;
+      r_input_area.xmax = output_area.xmax + filtersize_ + 1;
       break;
     case eDimension::Y:
-      r_input_area.ymin = output_area.ymin - m_filtersize - 1;
-      r_input_area.ymax = output_area.ymax + m_filtersize + 1;
+      r_input_area.ymin = output_area.ymin - filtersize_ - 1;
+      r_input_area.ymax = output_area.ymax + filtersize_ + 1;
       break;
   }
 }
@@ -120,29 +120,29 @@ void GaussianBlurBaseOperation::update_memory_buffer_partial(MemoryBuffer *outpu
 
   for (; !it.is_end(); ++it) {
     const int coord = get_current_coord();
-    const int coord_min = max_ii(coord - m_filtersize, min_input_coord);
-    const int coord_max = min_ii(coord + m_filtersize + 1, max_input_coord);
+    const int coord_min = max_ii(coord - filtersize_, min_input_coord);
+    const int coord_max = min_ii(coord + filtersize_ + 1, max_input_coord);
 
     float ATTR_ALIGN(16) color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
     float multiplier_accum = 0.0f;
 
-    const int step = QualityStepHelper::getStep();
+    const int step = QualityStepHelper::get_step();
     const float *in = it.in(0) + ((intptr_t)coord_min - coord) * elem_stride;
     const int in_stride = elem_stride * step;
-    int gauss_idx = (coord_min - coord) + m_filtersize;
+    int gauss_idx = (coord_min - coord) + filtersize_;
     const int gauss_end = gauss_idx + (coord_max - coord_min);
 #ifdef BLI_HAVE_SSE2
     __m128 accum_r = _mm_load_ps(color_accum);
     for (; gauss_idx < gauss_end; in += in_stride, gauss_idx += step) {
       __m128 reg_a = _mm_load_ps(in);
-      reg_a = _mm_mul_ps(reg_a, m_gausstab_sse[gauss_idx]);
+      reg_a = _mm_mul_ps(reg_a, gausstab_sse_[gauss_idx]);
       accum_r = _mm_add_ps(accum_r, reg_a);
-      multiplier_accum += m_gausstab[gauss_idx];
+      multiplier_accum += gausstab_[gauss_idx];
     }
     _mm_store_ps(color_accum, accum_r);
 #else
     for (; gauss_idx < gauss_end; in += in_stride, gauss_idx += step) {
-      const float multiplier = m_gausstab[gauss_idx];
+      const float multiplier = gausstab_[gauss_idx];
       madd_v4_v4fl(color_accum, in, multiplier);
       multiplier_accum += multiplier;
     }