Cleanup: use _ suffix for non-public data members in Compositor

For code style and clarity.
2021-10-13 23:01:53 +02:00
parent 1c42d4930a
commit f609b05b11
88 changed files with 126 additions and 126 deletions
--- a/source/blender/compositor/intern/COM_BufferOperation.cc
+++ b/source/blender/compositor/intern/COM_BufferOperation.cc
@@ -26,8 +26,8 @@ BufferOperation::BufferOperation(MemoryBuffer *buffer, DataType data_type)
  inflated_buffer_ = nullptr;
  set_canvas(buffer->get_rect());
  add_output_socket(data_type);
-  flags.is_constant_operation = buffer_->is_a_single_elem();
-  flags.is_fullframe_operation = false;
+  flags_.is_constant_operation = buffer_->is_a_single_elem();
+  flags_.is_fullframe_operation = false;
 }

 const float *BufferOperation::get_constant_elem()
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc
@@ -7,7 +7,7 @@ MultiThreadedOperation::MultiThreadedOperation()
 {
  num_passes_ = 1;
  current_pass_ = 0;
-  flags.is_fullframe_operation = true;
+  flags_.is_fullframe_operation = true;
 }

 void MultiThreadedOperation::update_memory_buffer(MemoryBuffer *output,
--- a/source/blender/compositor/intern/COM_Node.cc
+++ b/source/blender/compositor/intern/COM_Node.cc
@@ -66,11 +66,11 @@ Node::Node(bNode *editor_node, bool create_sockets)

 Node::~Node()
 {
-  while (!this->outputs.is_empty()) {
-    delete (this->outputs.pop_last());
+  while (!outputs_.is_empty()) {
+    delete (outputs_.pop_last());
  }
-  while (!this->inputs.is_empty()) {
-    delete (this->inputs.pop_last());
+  while (!inputs_.is_empty()) {
+    delete (inputs_.pop_last());
  }
 }

@@ -82,7 +82,7 @@ void Node::add_input_socket(DataType datatype)
 void Node::add_input_socket(DataType datatype, bNodeSocket *bSocket)
 {
  NodeInput *socket = new NodeInput(this, bSocket, datatype);
-  this->inputs.append(socket);
+  inputs_.append(socket);
 }

 void Node::add_output_socket(DataType datatype)
@@ -92,17 +92,17 @@ void Node::add_output_socket(DataType datatype)
 void Node::add_output_socket(DataType datatype, bNodeSocket *bSocket)
 {
  NodeOutput *socket = new NodeOutput(this, bSocket, datatype);
-  outputs.append(socket);
+  outputs_.append(socket);
 }

 NodeOutput *Node::get_output_socket(unsigned int index) const
 {
-  return outputs[index];
+  return outputs_[index];
 }

 NodeInput *Node::get_input_socket(unsigned int index) const
 {
-  return inputs[index];
+  return inputs_[index];
 }

 bNodeSocket *Node::get_editor_input_socket(int editor_node_input_socket_index)
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -62,12 +62,12 @@ class Node {
  /**
   * \brief the list of actual input-sockets \see NodeInput
   */
-  Vector<NodeInput *> inputs;
+  Vector<NodeInput *> inputs_;

  /**
   * \brief the list of actual output-sockets \see NodeOutput
   */
-  Vector<NodeOutput *> outputs;
+  Vector<NodeOutput *> outputs_;

 public:
  Node(bNode *editor_node, bool create_sockets = true);
@@ -114,7 +114,7 @@ class Node {
   */
  const Vector<NodeInput *> &get_input_sockets() const
  {
-    return this->inputs;
+    return inputs_;
  }

  /**
@@ -122,7 +122,7 @@ class Node {
   */
  const Vector<NodeOutput *> &get_output_sockets() const
  {
-    return this->outputs;
+    return outputs_;
  }

  /**
--- a/source/blender/compositor/intern/COM_NodeOperation.cc
+++ b/source/blender/compositor/intern/COM_NodeOperation.cc
@@ -205,7 +205,7 @@ void NodeOperation::deinit_execution()
 void NodeOperation::set_canvas(const rcti &canvas_area)
 {
  canvas_ = canvas_area;
-  flags.is_canvas_set = true;
+  flags_.is_canvas_set = true;
 }

 const rcti &NodeOperation::get_canvas() const
@@ -220,7 +220,7 @@ const rcti &NodeOperation::get_canvas() const
 void NodeOperation::unset_canvas()
 {
  BLI_assert(inputs_.size() == 0);
-  flags.is_canvas_set = false;
+  flags_.is_canvas_set = false;
 }

 SocketReader *NodeOperation::get_input_socket_reader(unsigned int index)
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -356,7 +356,7 @@ class NodeOperation {
  /**
   * Flags how to evaluate this operation.
   */
-  NodeOperationFlags flags;
+  NodeOperationFlags flags_;

  ExecutionSystem *exec_system_;

@@ -390,7 +390,7 @@ class NodeOperation {

  const NodeOperationFlags get_flags() const
  {
-    return flags;
+    return flags_;
  }

  std::optional<NodeOperationHash> generate_hash();
@@ -674,12 +674,12 @@ class NodeOperation {
  void set_width(unsigned int width)
  {
    canvas_.xmax = canvas_.xmin + width;
-    this->flags.is_canvas_set = true;
+    flags_.is_canvas_set = true;
  }
  void set_height(unsigned int height)
  {
    canvas_.ymax = canvas_.ymin + height;
-    this->flags.is_canvas_set = true;
+    flags_.is_canvas_set = true;
  }

  SocketReader *get_input_socket_reader(unsigned int index);
@@ -697,7 +697,7 @@ class NodeOperation {
   */
  void set_complex(bool complex)
  {
-    this->flags.complex = complex;
+    flags_.complex = complex;
  }

  /**
--- a/source/blender/compositor/intern/COM_SingleThreadedOperation.cc
+++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.cc
@@ -23,8 +23,8 @@ namespace blender::compositor {
 SingleThreadedOperation::SingleThreadedOperation()
 {
  cached_instance_ = nullptr;
-  flags.complex = true;
-  flags.single_threaded = true;
+  flags_.complex = true;
+  flags_.single_threaded = true;
 }

 void SingleThreadedOperation::init_execution()
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
@@ -255,7 +255,7 @@ CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation(
    const bNode &UNUSED(node),
    const NodeCryptomatte *cryptomatte_settings) const
 {
-  const int num_inputs = inputs.size() - 1;
+  const int num_inputs = inputs_.size() - 1;
  CryptomatteOperation *operation = new CryptomatteOperation(num_inputs);
  if (cryptomatte_settings) {
    LISTBASE_FOREACH (CryptomatteEntry *, cryptomatte_entry, &cryptomatte_settings->entries) {
--- a/source/blender/compositor/nodes/COM_ImageNode.cc
+++ b/source/blender/compositor/nodes/COM_ImageNode.cc
@@ -85,8 +85,8 @@ void ImageNode::convert_to_operations(NodeConverter &converter,
      if (rl) {
        is_multilayer_ok = true;

-        for (int64_t index = 0; index < outputs.size(); index++) {
-          NodeOutput *socket = outputs[index];
+        for (int64_t index = 0; index < outputs_.size(); index++) {
+          NodeOutput *socket = outputs_[index];
          NodeOperation *operation = nullptr;
          bNodeSocket *bnode_socket = socket->get_bnode_socket();
          NodeImageLayer *storage = (NodeImageLayer *)bnode_socket->storage;
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cc
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cc
@@ -27,7 +27,7 @@ OutputFileNode::OutputFileNode(bNode *editor_node) : Node(editor_node)

 void OutputFileNode::add_input_sockets(OutputOpenExrMultiLayerOperation &operation) const
 {
-  for (NodeInput *input : inputs) {
+  for (NodeInput *input : inputs_) {
    NodeImageMultiFileSocket *sockdata =
        (NodeImageMultiFileSocket *)input->get_bnode_socket()->storage;
    /* NOTE: layer becomes an empty placeholder if the input is not linked. */
@@ -40,7 +40,7 @@ void OutputFileNode::map_input_sockets(NodeConverter &converter,
 {
  bool preview_added = false;
  int index = 0;
-  for (NodeInput *input : inputs) {
+  for (NodeInput *input : inputs_) {
    converter.map_input_socket(input, operation.get_input_socket(index++));

    if (!preview_added) {
@@ -97,7 +97,7 @@ void OutputFileNode::convert_to_operations(NodeConverter &converter,
  }
  else { /* single layer format */
    bool preview_added = false;
-    for (NodeInput *input : inputs) {
+    for (NodeInput *input : inputs_) {
      if (input->is_linked()) {
        NodeImageMultiFileSocket *sockdata =
            (NodeImageMultiFileSocket *)input->get_bnode_socket()->storage;
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cc
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cc
@@ -150,7 +150,7 @@ void RenderLayersNode::missing_socket_link(NodeConverter &converter, NodeOutput

 void RenderLayersNode::missing_render_link(NodeConverter &converter) const
 {
-  for (NodeOutput *output : outputs) {
+  for (NodeOutput *output : outputs_) {
    missing_socket_link(converter, output);
  }
 }
--- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc
+++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc
@@ -22,7 +22,7 @@ namespace blender::compositor {

 AlphaOverKeyOperation::AlphaOverKeyOperation()
 {
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void AlphaOverKeyOperation::execute_pixel_sampled(float output[4],
--- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
+++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
@@ -23,7 +23,7 @@ namespace blender::compositor {
 AlphaOverMixedOperation::AlphaOverMixedOperation()
 {
  x_ = 0.0f;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void AlphaOverMixedOperation::execute_pixel_sampled(float output[4],
--- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc
+++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc
@@ -22,7 +22,7 @@ namespace blender::compositor {

 AlphaOverPremultiplyOperation::AlphaOverPremultiplyOperation()
 {
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void AlphaOverPremultiplyOperation::execute_pixel_sampled(float output[4],
--- a/source/blender/compositor/operations/COM_AntiAliasOperation.cc
+++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cc
@@ -113,7 +113,7 @@ AntiAliasOperation::AntiAliasOperation()
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Value);
  value_reader_ = nullptr;
-  this->flags.complex = true;
+  flags_.complex = true;
 }

 void AntiAliasOperation::init_execution()
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc
@@ -25,7 +25,7 @@ BilateralBlurOperation::BilateralBlurOperation()
  this->add_input_socket(DataType::Color);
  this->add_input_socket(DataType::Color);
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;

  input_color_program_ = nullptr;
  input_determinator_program_ = nullptr;
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cc
@@ -29,7 +29,7 @@ BlurBaseOperation::BlurBaseOperation(DataType data_type)
  this->add_input_socket(data_type);
  this->add_input_socket(DataType::Value);
  this->add_output_socket(data_type);
-  this->flags.complex = true;
+  flags_.complex = true;
  input_program_ = nullptr;
  memset(&data_, 0, sizeof(NodeBlurData));
  size_ = 1.0f;
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cc
@@ -36,8 +36,8 @@ BokehBlurOperation::BokehBlurOperation()
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Color);

-  flags.complex = true;
-  flags.open_cl = true;
+  flags_.complex = true;
+  flags_.open_cl = true;

  size_ = 1.0f;
  sizeavailable_ = false;
--- a/source/blender/compositor/operations/COM_BrightnessOperation.cc
+++ b/source/blender/compositor/operations/COM_BrightnessOperation.cc
@@ -28,7 +28,7 @@ BrightnessOperation::BrightnessOperation()
  this->add_output_socket(DataType::Color);
  input_program_ = nullptr;
  use_premultiply_ = false;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void BrightnessOperation::set_use_premultiply(bool use_premultiply)
--- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc
+++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc
@@ -31,7 +31,7 @@ CalculateMeanOperation::CalculateMeanOperation()
  image_reader_ = nullptr;
  iscalculated_ = false;
  setting_ = 1;
-  this->flags.complex = true;
+  flags_.complex = true;
 }
 void CalculateMeanOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_ChangeHSVOperation.cc
+++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.cc
@@ -28,7 +28,7 @@ ChangeHSVOperation::ChangeHSVOperation()
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Color);
  input_operation_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ChangeHSVOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cc
+++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cc
@@ -26,7 +26,7 @@ ChannelMatteOperation::ChannelMatteOperation()
  add_output_socket(DataType::Value);

  input_image_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ChannelMatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ChromaMatteOperation.cc
+++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.cc
@@ -28,7 +28,7 @@ ChromaMatteOperation::ChromaMatteOperation()

  input_image_program_ = nullptr;
  input_key_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ChromaMatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc
@@ -40,7 +40,7 @@ ColorBalanceASCCDLOperation::ColorBalanceASCCDLOperation()
  input_value_operation_ = nullptr;
  input_color_operation_ = nullptr;
  this->set_canvas_input_index(1);
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ColorBalanceASCCDLOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc
@@ -45,7 +45,7 @@ ColorBalanceLGGOperation::ColorBalanceLGGOperation()
  input_value_operation_ = nullptr;
  input_color_operation_ = nullptr;
  this->set_canvas_input_index(1);
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ColorBalanceLGGOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc
@@ -32,7 +32,7 @@ ColorCorrectionOperation::ColorCorrectionOperation()
  red_channel_enabled_ = true;
  green_channel_enabled_ = true;
  blue_channel_enabled_ = true;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void ColorCorrectionOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_ColorExposureOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorExposureOperation.cc
@@ -26,7 +26,7 @@ ExposureOperation::ExposureOperation()
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Color);
  input_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ExposureOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ColorMatteOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorMatteOperation.cc
@@ -28,7 +28,7 @@ ColorMatteOperation::ColorMatteOperation()

  input_image_program_ = nullptr;
  input_key_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ColorMatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ColorRampOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorRampOperation.cc
@@ -29,7 +29,7 @@ ColorRampOperation::ColorRampOperation()

  input_program_ = nullptr;
  color_band_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void ColorRampOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_ColorSpillOperation.cc
+++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cc
@@ -31,7 +31,7 @@ ColorSpillOperation::ColorSpillOperation()
  input_fac_reader_ = nullptr;
  spill_channel_ = 1; /* GREEN */
  spill_method_ = 0;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ColorSpillOperation::init_execution()
--- a/source/blender/compositor/operations/COM_CompositorOperation.cc
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cc
@@ -45,7 +45,7 @@ CompositorOperation::CompositorOperation()
  scene_name_[0] = '\0';
  view_name_ = nullptr;

-  flags.use_render_border = true;
+  flags_.use_render_border = true;
 }

 void CompositorOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ConstantOperation.cc
+++ b/source/blender/compositor/operations/COM_ConstantOperation.cc
@@ -23,13 +23,13 @@ namespace blender::compositor {
 ConstantOperation::ConstantOperation()
 {
  needs_canvas_to_get_constant_ = false;
-  flags.is_constant_operation = true;
-  flags.is_fullframe_operation = true;
+  flags_.is_constant_operation = true;
+  flags_.is_fullframe_operation = true;
 }

 bool ConstantOperation::can_get_constant_elem() const
 {
-  return !needs_canvas_to_get_constant_ || this->flags.is_canvas_set;
+  return !needs_canvas_to_get_constant_ || flags_.is_canvas_set;
 }

 void ConstantOperation::update_memory_buffer(MemoryBuffer *output,
--- a/source/blender/compositor/operations/COM_ConvertOperation.cc
+++ b/source/blender/compositor/operations/COM_ConvertOperation.cc
@@ -27,7 +27,7 @@ namespace blender::compositor {
 ConvertBaseOperation::ConvertBaseOperation()
 {
  input_operation_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ConvertBaseOperation::init_execution()
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
@@ -27,7 +27,7 @@ ConvolutionFilterOperation::ConvolutionFilterOperation()
  this->add_output_socket(DataType::Color);
  this->set_canvas_input_index(0);
  input_operation_ = nullptr;
-  this->flags.complex = true;
+  flags_.complex = true;
 }
 void ConvolutionFilterOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_CryptomatteOperation.cc
+++ b/source/blender/compositor/operations/COM_CryptomatteOperation.cc
@@ -27,7 +27,7 @@ CryptomatteOperation::CryptomatteOperation(size_t num_inputs)
    this->add_input_socket(DataType::Color);
  }
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
 }

 void CryptomatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_CurveBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_CurveBaseOperation.cc
@@ -25,7 +25,7 @@ namespace blender::compositor {
 CurveBaseOperation::CurveBaseOperation()
 {
  curve_mapping_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 CurveBaseOperation::~CurveBaseOperation()
--- a/source/blender/compositor/operations/COM_DenoiseOperation.cc
+++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc
@@ -127,7 +127,7 @@ class DenoiseFilter {

 DenoiseBaseOperation::DenoiseBaseOperation()
 {
-  flags.is_fullframe_operation = true;
+  flags_.is_fullframe_operation = true;
  output_rendered_ = false;
 }

--- a/source/blender/compositor/operations/COM_DespeckleOperation.cc
+++ b/source/blender/compositor/operations/COM_DespeckleOperation.cc
@@ -29,7 +29,7 @@ DespeckleOperation::DespeckleOperation()
  this->add_output_socket(DataType::Color);
  this->set_canvas_input_index(0);
  input_operation_ = nullptr;
-  this->flags.complex = true;
+  flags_.complex = true;
 }
 void DespeckleOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc
+++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc
@@ -28,7 +28,7 @@ DifferenceMatteOperation::DifferenceMatteOperation()

  input_image1_program_ = nullptr;
  input_image2_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void DifferenceMatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.cc
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cc
@@ -26,7 +26,7 @@ DilateErodeThresholdOperation::DilateErodeThresholdOperation()
 {
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Value);
-  this->flags.complex = true;
+  flags_.complex = true;
  input_program_ = nullptr;
  inset_ = 0.0f;
  switch_ = 0.5f;
@@ -275,8 +275,8 @@ DilateDistanceOperation::DilateDistanceOperation()
  this->add_output_socket(DataType::Value);
  input_program_ = nullptr;
  distance_ = 0.0f;
-  flags.complex = true;
-  flags.open_cl = true;
+  flags_.complex = true;
+  flags_.open_cl = true;
 }

 void DilateDistanceOperation::init_data()
@@ -536,7 +536,7 @@ DilateStepOperation::DilateStepOperation()
 {
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Value);
-  this->flags.complex = true;
+  flags_.complex = true;
  input_program_ = nullptr;
 }
 void DilateStepOperation::init_execution()
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
@@ -25,8 +25,8 @@ DirectionalBlurOperation::DirectionalBlurOperation()
 {
  this->add_input_socket(DataType::Color);
  this->add_output_socket(DataType::Color);
-  flags.complex = true;
-  flags.open_cl = true;
+  flags_.complex = true;
+  flags_.open_cl = true;
  input_program_ = nullptr;
 }

--- a/source/blender/compositor/operations/COM_DisplaceOperation.cc
+++ b/source/blender/compositor/operations/COM_DisplaceOperation.cc
@@ -27,7 +27,7 @@ DisplaceOperation::DisplaceOperation()
  this->add_input_socket(DataType::Value);
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;

  input_color_program_ = nullptr;
 }
--- a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc
+++ b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc
@@ -28,7 +28,7 @@ DistanceRGBMatteOperation::DistanceRGBMatteOperation()

  input_image_program_ = nullptr;
  input_key_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void DistanceRGBMatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_DotproductOperation.cc
+++ b/source/blender/compositor/operations/COM_DotproductOperation.cc
@@ -28,7 +28,7 @@ DotproductOperation::DotproductOperation()
  this->set_canvas_input_index(0);
  input1Operation_ = nullptr;
  input2Operation_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void DotproductOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
@@ -1326,7 +1326,7 @@ DoubleEdgeMaskOperation::DoubleEdgeMaskOperation()
  input_outer_mask_ = nullptr;
  adjacent_only_ = false;
  keep_inside_ = false;
-  this->flags.complex = true;
+  flags_.complex = true;
  is_output_rendered_ = false;
 }

--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
@@ -326,7 +326,7 @@ FastGaussianBlurValueOperation::FastGaussianBlurValueOperation()
  inputprogram_ = nullptr;
  sigma_ = 1.0f;
  overlay_ = 0;
-  flags.complex = true;
+  flags_.complex = true;
 }

 void FastGaussianBlurValueOperation::execute_pixel(float output[4], int x, int y, void *data)
--- a/source/blender/compositor/operations/COM_GammaCorrectOperation.cc
+++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.cc
@@ -25,7 +25,7 @@ GammaCorrectOperation::GammaCorrectOperation()
  this->add_input_socket(DataType::Color);
  this->add_output_socket(DataType::Color);
  input_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void GammaCorrectOperation::init_execution()
 {
@@ -96,7 +96,7 @@ GammaUncorrectOperation::GammaUncorrectOperation()
  this->add_input_socket(DataType::Color);
  this->add_output_socket(DataType::Color);
  input_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void GammaUncorrectOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_GammaOperation.cc
+++ b/source/blender/compositor/operations/COM_GammaOperation.cc
@@ -27,7 +27,7 @@ GammaOperation::GammaOperation()
  this->add_output_socket(DataType::Color);
  input_program_ = nullptr;
  input_gamma_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void GammaOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
@@ -59,7 +59,7 @@ class GaussianXBlurOperation : public GaussianBlurBaseOperation {

  void check_opencl()
  {
-    flags.open_cl = (data_.sizex >= 128);
+    flags_.open_cl = (data_.sizex >= 128);
  }
 };

--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
@@ -59,7 +59,7 @@ class GaussianYBlurOperation : public GaussianBlurBaseOperation {

  void check_opencl()
  {
-    flags.open_cl = (data_.sizex >= 128);
+    flags_.open_cl = (data_.sizex >= 128);
  }
 };

--- a/source/blender/compositor/operations/COM_GlareBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cc
@@ -25,7 +25,7 @@ GlareBaseOperation::GlareBaseOperation()
  this->add_input_socket(DataType::Color);
  this->add_output_socket(DataType::Color);
  settings_ = nullptr;
-  flags.is_fullframe_operation = true;
+  flags_.is_fullframe_operation = true;
  is_output_rendered_ = false;
 }
 void GlareBaseOperation::init_execution()
--- a/source/blender/compositor/operations/COM_IDMaskOperation.cc
+++ b/source/blender/compositor/operations/COM_IDMaskOperation.cc
@@ -24,8 +24,8 @@ IDMaskOperation::IDMaskOperation()
 {
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Value);
-  this->flags.complex = true;
-  flags.can_be_constant = true;
+  flags_.complex = true;
+  flags_.can_be_constant = true;
 }

 void *IDMaskOperation::initialize_tile_data(rcti *rect)
--- a/source/blender/compositor/operations/COM_InpaintOperation.cc
+++ b/source/blender/compositor/operations/COM_InpaintOperation.cc
@@ -30,13 +30,13 @@ InpaintSimpleOperation::InpaintSimpleOperation()
 {
  this->add_input_socket(DataType::Color);
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
  input_image_program_ = nullptr;
  pixelorder_ = nullptr;
  manhattan_distance_ = nullptr;
  cached_buffer_ = nullptr;
  cached_buffer_ready_ = false;
-  flags.is_fullframe_operation = true;
+  flags_.is_fullframe_operation = true;
 }
 void InpaintSimpleOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_InvertOperation.cc
+++ b/source/blender/compositor/operations/COM_InvertOperation.cc
@@ -30,7 +30,7 @@ InvertOperation::InvertOperation()
  color_ = true;
  alpha_ = false;
  set_canvas_input_index(1);
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }
 void InvertOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc
@@ -28,7 +28,7 @@ KeyingBlurOperation::KeyingBlurOperation()
  size_ = 0;
  axis_ = BLUR_AXIS_X;

-  this->flags.complex = true;
+  flags_.complex = true;
 }

 void *KeyingBlurOperation::initialize_tile_data(rcti *rect)
--- a/source/blender/compositor/operations/COM_KeyingClipOperation.cc
+++ b/source/blender/compositor/operations/COM_KeyingClipOperation.cc
@@ -33,7 +33,7 @@ KeyingClipOperation::KeyingClipOperation()

  is_edge_matte_ = false;

-  this->flags.complex = true;
+  flags_.complex = true;
 }

 void *KeyingClipOperation::initialize_tile_data(rcti *rect)
--- a/source/blender/compositor/operations/COM_KeyingDespillOperation.cc
+++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.cc
@@ -31,7 +31,7 @@ KeyingDespillOperation::KeyingDespillOperation()

  pixel_reader_ = nullptr;
  screen_reader_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void KeyingDespillOperation::init_execution()
--- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc
@@ -32,7 +32,7 @@ KeyingScreenOperation::KeyingScreenOperation()
  movie_clip_ = nullptr;
  framenumber_ = 0;
  tracking_object_[0] = 0;
-  flags.complex = true;
+  flags_.complex = true;
  cached_triangulation_ = nullptr;
 }

--- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc
+++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc
@@ -28,7 +28,7 @@ LuminanceMatteOperation::LuminanceMatteOperation()
  add_output_socket(DataType::Value);

  input_image_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void LuminanceMatteOperation::init_execution()
--- a/source/blender/compositor/operations/COM_MapRangeOperation.cc
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.cc
@@ -30,7 +30,7 @@ MapRangeOperation::MapRangeOperation()
  this->add_output_socket(DataType::Value);
  input_operation_ = nullptr;
  use_clamp_ = false;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void MapRangeOperation::init_execution()
--- a/source/blender/compositor/operations/COM_MapUVOperation.cc
+++ b/source/blender/compositor/operations/COM_MapUVOperation.cc
@@ -26,7 +26,7 @@ MapUVOperation::MapUVOperation()
  this->add_input_socket(DataType::Vector);
  this->add_output_socket(DataType::Color);
  alpha_ = 0.0f;
-  this->flags.complex = true;
+  flags_.complex = true;
  set_canvas_input_index(UV_INPUT_INDEX);

  inputUVProgram_ = nullptr;
--- a/source/blender/compositor/operations/COM_MapValueOperation.cc
+++ b/source/blender/compositor/operations/COM_MapValueOperation.cc
@@ -25,7 +25,7 @@ MapValueOperation::MapValueOperation()
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Value);
  input_operation_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void MapValueOperation::init_execution()
--- a/source/blender/compositor/operations/COM_MathBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_MathBaseOperation.cc
@@ -32,7 +32,7 @@ MathBaseOperation::MathBaseOperation()
  input_value2_operation_ = nullptr;
  input_value3_operation_ = nullptr;
  use_clamp_ = false;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void MathBaseOperation::init_execution()
--- a/source/blender/compositor/operations/COM_MixOperation.cc
+++ b/source/blender/compositor/operations/COM_MixOperation.cc
@@ -33,7 +33,7 @@ MixBaseOperation::MixBaseOperation()
  input_color2_operation_ = nullptr;
  this->set_use_value_alpha_multiply(false);
  this->set_use_clamp(false);
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void MixBaseOperation::init_execution()
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cc
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cc
@@ -26,8 +26,8 @@ NormalizeOperation::NormalizeOperation()
  this->add_output_socket(DataType::Value);
  image_reader_ = nullptr;
  cached_instance_ = nullptr;
-  this->flags.complex = true;
-  flags.can_be_constant = true;
+  flags_.complex = true;
+  flags_.can_be_constant = true;
 }
 void NormalizeOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
+++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
@@ -145,7 +145,7 @@ PlaneCornerPinMaskOperation::PlaneCornerPinMaskOperation() : corners_ready_(fals
   * so we can use the initialize_tile_data function
   * to read corners from input sockets ...
   */
-  flags.complex = true;
+  flags_.complex = true;
 }

 void PlaneCornerPinMaskOperation::init_data()
--- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
+++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
@@ -69,7 +69,7 @@ PlaneDistortWarpImageOperation::PlaneDistortWarpImageOperation() : PlaneDistortB
  this->add_input_socket(DataType::Color, ResizeMode::Align);
  this->add_output_socket(DataType::Color);
  pixel_reader_ = nullptr;
-  this->flags.complex = true;
+  flags_.complex = true;
 }

 void PlaneDistortWarpImageOperation::calculate_corners(const float corners[4][2],
--- a/source/blender/compositor/operations/COM_PosterizeOperation.cc
+++ b/source/blender/compositor/operations/COM_PosterizeOperation.cc
@@ -27,7 +27,7 @@ PosterizeOperation::PosterizeOperation()
  this->add_output_socket(DataType::Color);
  input_program_ = nullptr;
  input_steps_program_ = nullptr;
-  flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void PosterizeOperation::init_execution()
--- a/source/blender/compositor/operations/COM_PreviewOperation.cc
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cc
@@ -38,8 +38,8 @@ PreviewOperation::PreviewOperation(const ColorManagedViewSettings *view_settings
  display_settings_ = display_settings;
  default_width_ = default_width;
  default_height_ = default_height;
-  flags.use_viewer_border = true;
-  flags.is_preview_operation = true;
+  flags_.use_viewer_border = true;
+  flags_.is_preview_operation = true;
 }

 void PreviewOperation::verify_preview(bNodeInstanceHash *previews, bNodeInstanceKey key)
--- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc
+++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc
@@ -26,7 +26,7 @@ ProjectorLensDistortionOperation::ProjectorLensDistortionOperation()
  this->add_input_socket(DataType::Color);
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
  input_program_ = nullptr;
  dispersion_available_ = false;
  dispersion_ = 0.0f;
--- a/source/blender/compositor/operations/COM_ReadBufferOperation.cc
+++ b/source/blender/compositor/operations/COM_ReadBufferOperation.cc
@@ -29,7 +29,7 @@ ReadBufferOperation::ReadBufferOperation(DataType datatype)
  single_value_ = false;
  offset_ = 0;
  buffer_ = nullptr;
-  flags.is_read_buffer_operation = true;
+  flags_.is_read_buffer_operation = true;
 }

 void *ReadBufferOperation::initialize_tile_data(rcti * /*rect*/)
--- a/source/blender/compositor/operations/COM_SMAAOperation.cc
+++ b/source/blender/compositor/operations/COM_SMAAOperation.cc
@@ -170,7 +170,7 @@ SMAAEdgeDetectionOperation::SMAAEdgeDetectionOperation()
  this->add_input_socket(DataType::Color); /* image */
  this->add_input_socket(DataType::Value); /* Depth, material ID, etc. TODO: currently unused. */
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
  image_reader_ = nullptr;
  value_reader_ = nullptr;
  this->set_threshold(CMP_DEFAULT_SMAA_THRESHOLD);
@@ -400,7 +400,7 @@ SMAABlendingWeightCalculationOperation::SMAABlendingWeightCalculationOperation()
 {
  this->add_input_socket(DataType::Color); /* edges */
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
  image_reader_ = nullptr;
  this->set_corner_rounding(CMP_DEFAULT_SMAA_CORNER_ROUNDING);
 }
@@ -1010,7 +1010,7 @@ SMAANeighborhoodBlendingOperation::SMAANeighborhoodBlendingOperation()
  this->add_input_socket(DataType::Color); /* image */
  this->add_input_socket(DataType::Color); /* blend */
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
  image1Reader_ = nullptr;
  image2Reader_ = nullptr;
 }
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
@@ -32,7 +32,7 @@ ScreenLensDistortionOperation::ScreenLensDistortionOperation()
  this->add_input_socket(DataType::Value);
  this->add_input_socket(DataType::Value);
  this->add_output_socket(DataType::Color);
-  this->flags.complex = true;
+  flags_.complex = true;
  input_program_ = nullptr;
  distortion_ = 0.0f;
  dispersion_ = 0.0f;
--- a/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc
+++ b/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc
@@ -28,7 +28,7 @@ SetAlphaMultiplyOperation::SetAlphaMultiplyOperation()

  input_color_ = nullptr;
  input_alpha_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void SetAlphaMultiplyOperation::init_execution()
--- a/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc
+++ b/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc
@@ -28,7 +28,7 @@ SetAlphaReplaceOperation::SetAlphaReplaceOperation()

  input_color_ = nullptr;
  input_alpha_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void SetAlphaReplaceOperation::init_execution()
--- a/source/blender/compositor/operations/COM_SetColorOperation.cc
+++ b/source/blender/compositor/operations/COM_SetColorOperation.cc
@@ -23,7 +23,7 @@ namespace blender::compositor {
 SetColorOperation::SetColorOperation()
 {
  this->add_output_socket(DataType::Color);
-  flags.is_set_operation = true;
+  flags_.is_set_operation = true;
 }

 void SetColorOperation::execute_pixel_sampled(float output[4],
--- a/source/blender/compositor/operations/COM_SetValueOperation.cc
+++ b/source/blender/compositor/operations/COM_SetValueOperation.cc
@@ -23,7 +23,7 @@ namespace blender::compositor {
 SetValueOperation::SetValueOperation()
 {
  this->add_output_socket(DataType::Value);
-  flags.is_set_operation = true;
+  flags_.is_set_operation = true;
 }

 void SetValueOperation::execute_pixel_sampled(float output[4],
--- a/source/blender/compositor/operations/COM_SetVectorOperation.cc
+++ b/source/blender/compositor/operations/COM_SetVectorOperation.cc
@@ -23,7 +23,7 @@ namespace blender::compositor {
 SetVectorOperation::SetVectorOperation()
 {
  this->add_output_socket(DataType::Vector);
-  flags.is_set_operation = true;
+  flags_.is_set_operation = true;
 }

 void SetVectorOperation::execute_pixel_sampled(float output[4],
--- a/source/blender/compositor/operations/COM_SocketProxyOperation.cc
+++ b/source/blender/compositor/operations/COM_SocketProxyOperation.cc
@@ -24,8 +24,8 @@ SocketProxyOperation::SocketProxyOperation(DataType type, bool use_conversion)
 {
  this->add_input_socket(type);
  this->add_output_socket(type);
-  flags.is_proxy_operation = true;
-  flags.use_datatype_conversion = use_conversion;
+  flags_.is_proxy_operation = true;
+  flags_.use_datatype_conversion = use_conversion;
 }

 std::unique_ptr<MetaData> SocketProxyOperation::get_meta_data()
--- a/source/blender/compositor/operations/COM_SunBeamsOperation.cc
+++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cc
@@ -27,7 +27,7 @@ SunBeamsOperation::SunBeamsOperation()
  this->add_output_socket(DataType::Color);
  this->set_canvas_input_index(0);

-  this->flags.complex = true;
+  flags_.complex = true;
 }

 void SunBeamsOperation::calc_rays_common_data()
--- a/source/blender/compositor/operations/COM_TextureOperation.cc
+++ b/source/blender/compositor/operations/COM_TextureOperation.cc
@@ -34,7 +34,7 @@ TextureBaseOperation::TextureBaseOperation()
  rd_ = nullptr;
  pool_ = nullptr;
  scene_color_manage_ = false;
-  flags.complex = true;
+  flags_.complex = true;
 }
 TextureOperation::TextureOperation() : TextureBaseOperation()
 {
--- a/source/blender/compositor/operations/COM_TonemapOperation.cc
+++ b/source/blender/compositor/operations/COM_TonemapOperation.cc
@@ -31,7 +31,7 @@ TonemapOperation::TonemapOperation()
  image_reader_ = nullptr;
  data_ = nullptr;
  cached_instance_ = nullptr;
-  this->flags.complex = true;
+  flags_.complex = true;
 }
 void TonemapOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_TrackPositionOperation.cc
+++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cc
@@ -35,7 +35,7 @@ TrackPositionOperation::TrackPositionOperation()
  position_ = CMP_TRACKPOS_ABSOLUTE;
  relative_frame_ = 0;
  speed_output_ = false;
-  flags.is_set_operation = true;
+  flags_.is_set_operation = true;
  is_track_position_calculated_ = false;
 }

--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
@@ -31,8 +31,8 @@ VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation()
  this->add_input_socket(DataType::Color, ResizeMode::None);
 #endif
  this->add_output_socket(DataType::Color);
-  flags.complex = true;
-  flags.open_cl = true;
+  flags_.complex = true;
+  flags_.open_cl = true;

  input_program_ = nullptr;
  input_bokeh_program_ = nullptr;
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc
@@ -51,8 +51,8 @@ VectorBlurOperation::VectorBlurOperation()
  input_image_program_ = nullptr;
  input_speed_program_ = nullptr;
  input_zprogram_ = nullptr;
-  flags.complex = true;
-  flags.is_fullframe_operation = true;
+  flags_.complex = true;
+  flags_.is_fullframe_operation = true;
 }
 void VectorBlurOperation::init_execution()
 {
--- a/source/blender/compositor/operations/COM_ViewerOperation.cc
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cc
@@ -50,8 +50,8 @@ ViewerOperation::ViewerOperation()
  depth_input_ = nullptr;
  rd_ = nullptr;
  view_name_ = nullptr;
-  flags.use_viewer_border = true;
-  flags.is_viewer_operation = true;
+  flags_.use_viewer_border = true;
+  flags_.is_viewer_operation = true;
 }

 void ViewerOperation::init_execution()
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.cc
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cc
@@ -27,7 +27,7 @@ WriteBufferOperation::WriteBufferOperation(DataType datatype)
  memory_proxy_ = new MemoryProxy(datatype);
  memory_proxy_->set_write_buffer_operation(this);
  memory_proxy_->set_executor(nullptr);
-  flags.is_write_buffer_operation = true;
+  flags_.is_write_buffer_operation = true;
 }
 WriteBufferOperation::~WriteBufferOperation()
 {
--- a/source/blender/compositor/operations/COM_ZCombineOperation.cc
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.cc
@@ -32,7 +32,7 @@ ZCombineOperation::ZCombineOperation()
  depth1Reader_ = nullptr;
  image2Reader_ = nullptr;
  depth2Reader_ = nullptr;
-  this->flags.can_be_constant = true;
+  flags_.can_be_constant = true;
 }

 void ZCombineOperation::init_execution()