1 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h
index 40ef9f38f79..054398604b6 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.h
+++ b/source/blender/compositor/operations/COM_ImageOperation.h
@@ -36,19 +36,19 @@ class BaseImageOperation : public MultiThreadedOperation {
  protected:
   ImBuf *buffer_;
   Image *image_;
-  ImageUser *imageUser_;
+  ImageUser *image_user_;
   /* TODO: Remove raw buffers when removing Tiled implementation. */
-  float *imageFloatBuffer_;
-  unsigned int *imageByteBuffer_;
-  float *depthBuffer_;
+  float *image_float_buffer_;
+  unsigned int *image_byte_buffer_;
+  float *image_depth_buffer_;
 
   MemoryBuffer *depth_buffer_;
   int imageheight_;
   int imagewidth_;
   int framenumber_;
-  int numberOfChannels_;
+  int number_of_channels_;
   const RenderData *rd_;
-  const char *viewName_;
+  const char *view_name_;
 
   BaseImageOperation();
   /**
@@ -56,28 +56,28 @@ class BaseImageOperation : public MultiThreadedOperation {
    */
   void determine_canvas(const rcti &preferred_area, rcti &r_area) override;
 
-  virtual ImBuf *getImBuf();
+  virtual ImBuf *get_im_buf();
 
  public:
-  void initExecution() override;
-  void deinitExecution() override;
-  void setImage(Image *image)
+  void init_execution() override;
+  void deinit_execution() override;
+  void set_image(Image *image)
   {
     image_ = image;
   }
-  void setImageUser(ImageUser *imageuser)
+  void set_image_user(ImageUser *imageuser)
   {
-    imageUser_ = imageuser;
+    image_user_ = imageuser;
   }
-  void setRenderData(const RenderData *rd)
+  void set_render_data(const RenderData *rd)
   {
     rd_ = rd;
   }
-  void setViewName(const char *viewName)
+  void set_view_name(const char *view_name)
   {
-    viewName_ = viewName;
+    view_name_ = view_name;
   }
-  void setFramenumber(int framenumber)
+  void set_framenumber(int framenumber)
   {
     framenumber_ = framenumber;
   }
@@ -88,7 +88,7 @@ class ImageOperation : public BaseImageOperation {
    * Constructor
    */
   ImageOperation();
-  void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+  void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override;
 
   void update_memory_buffer_partial(MemoryBuffer *output,
                                     const rcti &area,
@@ -100,7 +100,7 @@ class ImageAlphaOperation : public BaseImageOperation {
    * Constructor
    */
   ImageAlphaOperation();
-  void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+  void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override;
 
   void update_memory_buffer_partial(MemoryBuffer *output,
                                     const rcti &area,
@@ -112,7 +112,7 @@ class ImageDepthOperation : public BaseImageOperation {
    * Constructor
    */
   ImageDepthOperation();
-  void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+  void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override;
 
   void update_memory_buffer_partial(MemoryBuffer *output,
                                     const rcti &area,