1 files changed, 30 insertions, 30 deletions

diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cc b/source/blender/compositor/operations/COM_BokehImageOperation.cc
index fb2799e378b..5389fa633b0 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.cc
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.cc
@@ -23,33 +23,33 @@ namespace blender::compositor {
 BokehImageOperation::BokehImageOperation()
 {
   this->addOutputSocket(DataType::Color);
-  m_deleteData = false;
+  deleteData_ = false;
 }
 void BokehImageOperation::initExecution()
 {
-  m_center[0] = getWidth() / 2;
-  m_center[1] = getHeight() / 2;
-  m_inverseRounding = 1.0f - m_data->rounding;
-  m_circularDistance = getWidth() / 2;
-  m_flapRad = (float)(M_PI * 2) / m_data->flaps;
-  m_flapRadAdd = m_data->angle;
-  while (m_flapRadAdd < 0.0f) {
-    m_flapRadAdd += (float)(M_PI * 2.0);
+  center_[0] = getWidth() / 2;
+  center_[1] = getHeight() / 2;
+  inverseRounding_ = 1.0f - data_->rounding;
+  circularDistance_ = getWidth() / 2;
+  flapRad_ = (float)(M_PI * 2) / data_->flaps;
+  flapRadAdd_ = data_->angle;
+  while (flapRadAdd_ < 0.0f) {
+    flapRadAdd_ += (float)(M_PI * 2.0);
   }
-  while (m_flapRadAdd > (float)M_PI) {
-    m_flapRadAdd -= (float)(M_PI * 2.0);
+  while (flapRadAdd_ > (float)M_PI) {
+    flapRadAdd_ -= (float)(M_PI * 2.0);
   }
 }
 void BokehImageOperation::detemineStartPointOfFlap(float r[2], int flapNumber, float distance)
 {
-  r[0] = sinf(m_flapRad * flapNumber + m_flapRadAdd) * distance + m_center[0];
-  r[1] = cosf(m_flapRad * flapNumber + m_flapRadAdd) * distance + m_center[1];
+  r[0] = sinf(flapRad_ * flapNumber + flapRadAdd_) * distance + center_[0];
+  r[1] = cosf(flapRad_ * flapNumber + flapRadAdd_) * distance + center_[1];
 }
 float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 {
   float insideBokeh = 0.0f;
-  const float deltaX = x - m_center[0];
-  const float deltaY = y - m_center[1];
+  const float deltaX = x - center_[0];
+  const float deltaY = y - center_[1];
   float closestPoint[2];
   float lineP1[2];
   float lineP2[2];
@@ -57,25 +57,25 @@ float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
   point[0] = x;
   point[1] = y;
 
-  const float distanceToCenter = len_v2v2(point, m_center);
+  const float distanceToCenter = len_v2v2(point, center_);
   const float bearing = (atan2f(deltaX, deltaY) + (float)(M_PI * 2.0));
-  int flapNumber = (int)((bearing - m_flapRadAdd) / m_flapRad);
+  int flapNumber = (int)((bearing - flapRadAdd_) / flapRad_);
 
   detemineStartPointOfFlap(lineP1, flapNumber, distance);
   detemineStartPointOfFlap(lineP2, flapNumber + 1, distance);
   closest_to_line_v2(closestPoint, point, lineP1, lineP2);
 
-  const float distanceLineToCenter = len_v2v2(m_center, closestPoint);
-  const float distanceRoundingToCenter = m_inverseRounding * distanceLineToCenter +
-                                         m_data->rounding * distance;
+  const float distanceLineToCenter = len_v2v2(center_, closestPoint);
+  const float distanceRoundingToCenter = inverseRounding_ * distanceLineToCenter +
+                                         data_->rounding * distance;
 
-  const float catadioptricDistanceToCenter = distanceRoundingToCenter * m_data->catadioptric;
+  const float catadioptricDistanceToCenter = distanceRoundingToCenter * data_->catadioptric;
   if (distanceRoundingToCenter >= distanceToCenter &&
       catadioptricDistanceToCenter <= distanceToCenter) {
     if (distanceRoundingToCenter - distanceToCenter < 1.0f) {
       insideBokeh = (distanceRoundingToCenter - distanceToCenter);
     }
-    else if (m_data->catadioptric != 0.0f &&
+    else if (data_->catadioptric != 0.0f &&
              distanceToCenter - catadioptricDistanceToCenter < 1.0f) {
       insideBokeh = (distanceToCenter - catadioptricDistanceToCenter);
     }
@@ -90,9 +90,9 @@ void BokehImageOperation::executePixelSampled(float output[4],
                                               float y,
                                               PixelSampler /*sampler*/)
 {
-  float shift = m_data->lensshift;
+  float shift = data_->lensshift;
   float shift2 = shift / 2.0f;
-  float distance = m_circularDistance;
+  float distance = circularDistance_;
   float insideBokehMax = isInsideBokeh(distance, x, y);
   float insideBokehMed = isInsideBokeh(distance - fabsf(shift2 * distance), x, y);
   float insideBokehMin = isInsideBokeh(distance - fabsf(shift * distance), x, y);
@@ -113,9 +113,9 @@ void BokehImageOperation::update_memory_buffer_partial(MemoryBuffer *output,
                                                        const rcti &area,
                                                        Span<MemoryBuffer *> UNUSED(inputs))
 {
-  const float shift = m_data->lensshift;
+  const float shift = data_->lensshift;
   const float shift2 = shift / 2.0f;
-  const float distance = m_circularDistance;
+  const float distance = circularDistance_;
   for (BuffersIterator<float> it = output->iterate_with({}, area); !it.is_end(); ++it) {
     const float insideBokehMax = isInsideBokeh(distance, it.x, it.y);
     const float insideBokehMed = isInsideBokeh(distance - fabsf(shift2 * distance), it.x, it.y);
@@ -136,10 +136,10 @@ void BokehImageOperation::update_memory_buffer_partial(MemoryBuffer *output,
 
 void BokehImageOperation::deinitExecution()
 {
-  if (m_deleteData) {
-    if (m_data) {
-      delete m_data;
-      m_data = nullptr;
+  if (deleteData_) {
+    if (data_) {
+      delete data_;
+      data_ = nullptr;
     }
   }
 }