From f609b05b11cedb021fb05a89db124d979ab9de9b Mon Sep 17 00:00:00 2001 From: Manuel Castilla Date: Wed, 13 Oct 2021 23:01:53 +0200 Subject: Cleanup: use `_` suffix for non-public data members in Compositor For code style and clarity. --- source/blender/compositor/intern/COM_BufferOperation.cc | 4 ++-- .../compositor/intern/COM_MultiThreadedOperation.cc | 2 +- source/blender/compositor/intern/COM_Node.cc | 16 ++++++++-------- source/blender/compositor/intern/COM_Node.h | 8 ++++---- source/blender/compositor/intern/COM_NodeOperation.cc | 4 ++-- source/blender/compositor/intern/COM_NodeOperation.h | 10 +++++----- .../compositor/intern/COM_SingleThreadedOperation.cc | 4 ++-- source/blender/compositor/nodes/COM_CryptomatteNode.cc | 2 +- source/blender/compositor/nodes/COM_ImageNode.cc | 4 ++-- source/blender/compositor/nodes/COM_OutputFileNode.cc | 6 +++--- source/blender/compositor/nodes/COM_RenderLayersNode.cc | 2 +- .../compositor/operations/COM_AlphaOverKeyOperation.cc | 2 +- .../compositor/operations/COM_AlphaOverMixedOperation.cc | 2 +- .../operations/COM_AlphaOverPremultiplyOperation.cc | 2 +- .../compositor/operations/COM_AntiAliasOperation.cc | 2 +- .../compositor/operations/COM_BilateralBlurOperation.cc | 2 +- .../compositor/operations/COM_BlurBaseOperation.cc | 2 +- .../compositor/operations/COM_BokehBlurOperation.cc | 4 ++-- .../compositor/operations/COM_BrightnessOperation.cc | 2 +- .../compositor/operations/COM_CalculateMeanOperation.cc | 2 +- .../compositor/operations/COM_ChangeHSVOperation.cc | 2 +- .../compositor/operations/COM_ChannelMatteOperation.cc | 2 +- .../compositor/operations/COM_ChromaMatteOperation.cc | 2 +- .../operations/COM_ColorBalanceASCCDLOperation.cc | 2 +- .../operations/COM_ColorBalanceLGGOperation.cc | 2 +- .../operations/COM_ColorCorrectionOperation.cc | 2 +- .../compositor/operations/COM_ColorExposureOperation.cc | 2 +- .../compositor/operations/COM_ColorMatteOperation.cc | 2 +- .../compositor/operations/COM_ColorRampOperation.cc | 2 +- .../compositor/operations/COM_ColorSpillOperation.cc | 2 +- .../compositor/operations/COM_CompositorOperation.cc | 2 +- .../compositor/operations/COM_ConstantOperation.cc | 6 +++--- .../compositor/operations/COM_ConvertOperation.cc | 2 +- .../operations/COM_ConvolutionFilterOperation.cc | 2 +- .../compositor/operations/COM_CryptomatteOperation.cc | 2 +- .../compositor/operations/COM_CurveBaseOperation.cc | 2 +- .../compositor/operations/COM_DenoiseOperation.cc | 2 +- .../compositor/operations/COM_DespeckleOperation.cc | 2 +- .../operations/COM_DifferenceMatteOperation.cc | 2 +- .../compositor/operations/COM_DilateErodeOperation.cc | 8 ++++---- .../operations/COM_DirectionalBlurOperation.cc | 4 ++-- .../compositor/operations/COM_DisplaceOperation.cc | 2 +- .../operations/COM_DistanceRGBMatteOperation.cc | 2 +- .../compositor/operations/COM_DotproductOperation.cc | 2 +- .../compositor/operations/COM_DoubleEdgeMaskOperation.cc | 2 +- .../operations/COM_FastGaussianBlurOperation.cc | 2 +- .../compositor/operations/COM_GammaCorrectOperation.cc | 4 ++-- .../blender/compositor/operations/COM_GammaOperation.cc | 2 +- .../compositor/operations/COM_GaussianXBlurOperation.h | 2 +- .../compositor/operations/COM_GaussianYBlurOperation.h | 2 +- .../compositor/operations/COM_GlareBaseOperation.cc | 2 +- .../blender/compositor/operations/COM_IDMaskOperation.cc | 4 ++-- .../compositor/operations/COM_InpaintOperation.cc | 4 ++-- .../blender/compositor/operations/COM_InvertOperation.cc | 2 +- .../compositor/operations/COM_KeyingBlurOperation.cc | 2 +- .../compositor/operations/COM_KeyingClipOperation.cc | 2 +- .../compositor/operations/COM_KeyingDespillOperation.cc | 2 +- .../compositor/operations/COM_KeyingScreenOperation.cc | 2 +- .../compositor/operations/COM_LuminanceMatteOperation.cc | 2 +- .../compositor/operations/COM_MapRangeOperation.cc | 2 +- .../blender/compositor/operations/COM_MapUVOperation.cc | 2 +- .../compositor/operations/COM_MapValueOperation.cc | 2 +- .../compositor/operations/COM_MathBaseOperation.cc | 2 +- source/blender/compositor/operations/COM_MixOperation.cc | 2 +- .../compositor/operations/COM_NormalizeOperation.cc | 4 ++-- .../compositor/operations/COM_PlaneCornerPinOperation.cc | 2 +- .../operations/COM_PlaneDistortCommonOperation.cc | 2 +- .../compositor/operations/COM_PosterizeOperation.cc | 2 +- .../compositor/operations/COM_PreviewOperation.cc | 4 ++-- .../operations/COM_ProjectorLensDistortionOperation.cc | 2 +- .../compositor/operations/COM_ReadBufferOperation.cc | 2 +- .../blender/compositor/operations/COM_SMAAOperation.cc | 6 +++--- .../operations/COM_ScreenLensDistortionOperation.cc | 2 +- .../operations/COM_SetAlphaMultiplyOperation.cc | 2 +- .../operations/COM_SetAlphaReplaceOperation.cc | 2 +- .../compositor/operations/COM_SetColorOperation.cc | 2 +- .../compositor/operations/COM_SetValueOperation.cc | 2 +- .../compositor/operations/COM_SetVectorOperation.cc | 2 +- .../compositor/operations/COM_SocketProxyOperation.cc | 4 ++-- .../compositor/operations/COM_SunBeamsOperation.cc | 2 +- .../compositor/operations/COM_TextureOperation.cc | 2 +- .../compositor/operations/COM_TonemapOperation.cc | 2 +- .../compositor/operations/COM_TrackPositionOperation.cc | 2 +- .../operations/COM_VariableSizeBokehBlurOperation.cc | 4 ++-- .../compositor/operations/COM_VectorBlurOperation.cc | 4 ++-- .../blender/compositor/operations/COM_ViewerOperation.cc | 4 ++-- .../compositor/operations/COM_WriteBufferOperation.cc | 2 +- .../compositor/operations/COM_ZCombineOperation.cc | 2 +- 88 files changed, 126 insertions(+), 126 deletions(-) (limited to 'source') diff --git a/source/blender/compositor/intern/COM_BufferOperation.cc b/source/blender/compositor/intern/COM_BufferOperation.cc index 21238733925..81ea645e482 100644 --- 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() diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.cc b/source/blender/compositor/intern/COM_MultiThreadedOperation.cc index 7ccf6f76d9f..d118027202a 100644 --- 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, diff --git a/source/blender/compositor/intern/COM_Node.cc b/source/blender/compositor/intern/COM_Node.cc index 58b2b195579..67af9496ca4 100644 --- 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) diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index 41283b821bb..bd8b37276a0 100644 --- 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 inputs; + Vector inputs_; /** * \brief the list of actual output-sockets \see NodeOutput */ - Vector outputs; + Vector outputs_; public: Node(bNode *editor_node, bool create_sockets = true); @@ -114,7 +114,7 @@ class Node { */ const Vector &get_input_sockets() const { - return this->inputs; + return inputs_; } /** @@ -122,7 +122,7 @@ class Node { */ const Vector &get_output_sockets() const { - return this->outputs; + return outputs_; } /** diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc index 41c645b9eea..8a7ae1f4fcb 100644 --- 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) diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 3c172faca50..627fffb1ec7 100644 --- 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 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; } /** diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.cc b/source/blender/compositor/intern/COM_SingleThreadedOperation.cc index fab6c352a02..5ad324459fd 100644 --- 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() diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index f54088627e1..605dc1dc84d 100644 --- 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) { diff --git a/source/blender/compositor/nodes/COM_ImageNode.cc b/source/blender/compositor/nodes/COM_ImageNode.cc index 928a7c735c7..cc1c4109d9e 100644 --- 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; diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cc b/source/blender/compositor/nodes/COM_OutputFileNode.cc index 25d201fc9c4..1a9908d4a93 100644 --- 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; diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cc b/source/blender/compositor/nodes/COM_RenderLayersNode.cc index 92033c3fbe8..4b82c5cbc21 100644 --- 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); } } diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc index 3c5053d8357..5b8d376cf79 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc index 102d031d9be..42efca996ab 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc index 2d04c22533b..a627705fab5 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cc b/source/blender/compositor/operations/COM_AntiAliasOperation.cc index 28fea7b406c..2695e47aa60 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc index 5f7d2432f05..32780ad4ea8 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cc b/source/blender/compositor/operations/COM_BlurBaseOperation.cc index 15e2ce2d1e0..aefe74a7e26 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cc b/source/blender/compositor/operations/COM_BokehBlurOperation.cc index 80e7390e02f..3c8dd94c094 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.cc b/source/blender/compositor/operations/COM_BrightnessOperation.cc index a445bb122c2..cebcc14b13a 100644 --- 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) diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc index f759ba5ccef..b8d85675041 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.cc b/source/blender/compositor/operations/COM_ChangeHSVOperation.cc index b4effc087b1..7c64b1954d4 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cc b/source/blender/compositor/operations/COM_ChannelMatteOperation.cc index 0a6b8255c42..af20193118c 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.cc b/source/blender/compositor/operations/COM_ChromaMatteOperation.cc index fceb0ea1c23..d0fc65ef331 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc index e12138c1f00..533854b62dd 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc index d9af1b0a074..606fd560cff 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc index 538227d899b..2e7ce6b8497 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_ColorExposureOperation.cc b/source/blender/compositor/operations/COM_ColorExposureOperation.cc index 9a785962bd5..890a0ab4ccb 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.cc b/source/blender/compositor/operations/COM_ColorMatteOperation.cc index c4bf1bdf1cf..14123d99b0f 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.cc b/source/blender/compositor/operations/COM_ColorRampOperation.cc index bd86528d143..94b840a6f73 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cc b/source/blender/compositor/operations/COM_ColorSpillOperation.cc index 39be05ece38..d614c963488 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc index e27fc971a87..354997ebd2e 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ConstantOperation.cc b/source/blender/compositor/operations/COM_ConstantOperation.cc index c127860a89c..400c04d9592 100644 --- 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, diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cc b/source/blender/compositor/operations/COM_ConvertOperation.cc index 7f1018ca71e..ec321494c6f 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc index 6ee5a1c86f9..2e9990348c1 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.cc b/source/blender/compositor/operations/COM_CryptomatteOperation.cc index 078ec9b6dfe..8a246269691 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.cc b/source/blender/compositor/operations/COM_CurveBaseOperation.cc index c65a1a45750..a014fb17750 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc index dd8e6df69fc..53417112974 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.cc b/source/blender/compositor/operations/COM_DespeckleOperation.cc index be0dc06b8ec..c60a4167dfc 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc index 8391bbb799a..251dc4cc161 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cc b/source/blender/compositor/operations/COM_DilateErodeOperation.cc index 7fc186df35f..2abc4f71b5e 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc index eff7fa84475..1104ef6f71f 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cc b/source/blender/compositor/operations/COM_DisplaceOperation.cc index 0c5b8dea2e6..4742692b75d 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc index 95593d7d49f..7618e318c77 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_DotproductOperation.cc b/source/blender/compositor/operations/COM_DotproductOperation.cc index 9507f991b52..ce1432547ae 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc index 559df4abb0c..22899bd396a 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc index e39db9e06eb..850fad1d96a 100644 --- 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) diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.cc b/source/blender/compositor/operations/COM_GammaCorrectOperation.cc index 0271e57b2c4..57d2ebd1b84 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_GammaOperation.cc b/source/blender/compositor/operations/COM_GammaOperation.cc index fb8f18bcc28..3ea7f35f1b5 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index b9bbe1df900..72356381da3 100644 --- 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); } }; diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index 4390c9544e4..817e5a137c2 100644 --- 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); } }; diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cc b/source/blender/compositor/operations/COM_GlareBaseOperation.cc index 37082f29579..766b20326db 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.cc b/source/blender/compositor/operations/COM_IDMaskOperation.cc index 5837cb1fda9..503cbf5eb31 100644 --- 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) diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cc b/source/blender/compositor/operations/COM_InpaintOperation.cc index 96cd0043470..2d632bb3681 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_InvertOperation.cc b/source/blender/compositor/operations/COM_InvertOperation.cc index cbc15c95f46..3722282bd73 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc index bb82e74f92a..7fbe96d382b 100644 --- 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) diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.cc b/source/blender/compositor/operations/COM_KeyingClipOperation.cc index 03e3f0611c0..d52b2801811 100644 --- 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) diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.cc b/source/blender/compositor/operations/COM_KeyingDespillOperation.cc index f819a39e9e0..d200d1e5eb3 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc index d7e56aaa7c6..c34eaad87ef 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc index 36dc9c42b8b..f2543d0d159 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cc b/source/blender/compositor/operations/COM_MapRangeOperation.cc index e8ce1f100c3..7d63a473500 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cc b/source/blender/compositor/operations/COM_MapUVOperation.cc index fb4fcff381d..8f46332c9bc 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_MapValueOperation.cc b/source/blender/compositor/operations/COM_MapValueOperation.cc index da5ab04cc98..1e6570f2f64 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cc b/source/blender/compositor/operations/COM_MathBaseOperation.cc index 55151b70050..86993ffe887 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_MixOperation.cc b/source/blender/compositor/operations/COM_MixOperation.cc index a40979fc1e6..09bbb633459 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cc b/source/blender/compositor/operations/COM_NormalizeOperation.cc index 89793897a58..0625cdb5ddb 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc index 6a6692c977d..8467a5d9d97 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc index 21757e4c97d..a11a358c71d 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_PosterizeOperation.cc b/source/blender/compositor/operations/COM_PosterizeOperation.cc index c43520d103c..585acb31e68 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index f46f0f5b13f..a3fe0acebdf 100644 --- 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) diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc index 436fdb16e8d..4813af511f7 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.cc b/source/blender/compositor/operations/COM_ReadBufferOperation.cc index 75b4c61a376..b0e0b2c219f 100644 --- 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*/) diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc index c73462d2e6d..ef67b6ca5f9 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc index 1ce0378c335..e36770b11a1 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc b/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc index a1ea5758a83..9f193985d38 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc b/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc index 649e6ce0a4e..c4490cab178 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_SetColorOperation.cc b/source/blender/compositor/operations/COM_SetColorOperation.cc index 2f89e6722fa..b7fee856053 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_SetValueOperation.cc b/source/blender/compositor/operations/COM_SetValueOperation.cc index 9cd4bed0750..d11a35aefc3 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.cc b/source/blender/compositor/operations/COM_SetVectorOperation.cc index 47f13f10fee..c1db429b41e 100644 --- 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], diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.cc b/source/blender/compositor/operations/COM_SocketProxyOperation.cc index 18a09362591..fd37f0b5f4f 100644 --- 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 SocketProxyOperation::get_meta_data() diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cc b/source/blender/compositor/operations/COM_SunBeamsOperation.cc index 5842fcc2278..b673a1ac754 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc index da1c90cd1c5..2ed83e87569 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cc b/source/blender/compositor/operations/COM_TonemapOperation.cc index 6d3fc9380c1..bc370e3496b 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cc b/source/blender/compositor/operations/COM_TrackPositionOperation.cc index f329bfb0656..fc6be97a29c 100644 --- 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; } diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc index 07baf370d1d..891518d53bf 100644 --- 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; diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc index 8fd074749cd..b220990db76 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index 440deea7796..be8fe1416d0 100644 --- 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() diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cc b/source/blender/compositor/operations/COM_WriteBufferOperation.cc index 1c728772fdd..2511488615e 100644 --- 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() { diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cc b/source/blender/compositor/operations/COM_ZCombineOperation.cc index 9593e909d5a..c9b3e70a9cd 100644 --- 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() -- cgit v1.2.3