[Bf-blender-cvs] [f609b05b11c] master: Cleanup: use `_` suffix for non-public data members in Compositor
Manuel Castilla
noreply at git.blender.org
Wed Oct 13 23:46:46 CEST 2021
Commit: f609b05b11cedb021fb05a89db124d979ab9de9b
Author: Manuel Castilla
Date: Wed Oct 13 23:01:53 2021 +0200
Branches: master
https://developer.blender.org/rBf609b05b11cedb021fb05a89db124d979ab9de9b
Cleanup: use `_` suffix for non-public data members in Compositor
For code style and clarity.
===================================================================
M source/blender/compositor/intern/COM_BufferOperation.cc
M source/blender/compositor/intern/COM_MultiThreadedOperation.cc
M source/blender/compositor/intern/COM_Node.cc
M source/blender/compositor/intern/COM_Node.h
M source/blender/compositor/intern/COM_NodeOperation.cc
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_SingleThreadedOperation.cc
M source/blender/compositor/nodes/COM_CryptomatteNode.cc
M source/blender/compositor/nodes/COM_ImageNode.cc
M source/blender/compositor/nodes/COM_OutputFileNode.cc
M source/blender/compositor/nodes/COM_RenderLayersNode.cc
M source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc
M source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
M source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc
M source/blender/compositor/operations/COM_AntiAliasOperation.cc
M source/blender/compositor/operations/COM_BilateralBlurOperation.cc
M source/blender/compositor/operations/COM_BlurBaseOperation.cc
M source/blender/compositor/operations/COM_BokehBlurOperation.cc
M source/blender/compositor/operations/COM_BrightnessOperation.cc
M source/blender/compositor/operations/COM_CalculateMeanOperation.cc
M source/blender/compositor/operations/COM_ChangeHSVOperation.cc
M source/blender/compositor/operations/COM_ChannelMatteOperation.cc
M source/blender/compositor/operations/COM_ChromaMatteOperation.cc
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc
M source/blender/compositor/operations/COM_ColorCorrectionOperation.cc
M source/blender/compositor/operations/COM_ColorExposureOperation.cc
M source/blender/compositor/operations/COM_ColorMatteOperation.cc
M source/blender/compositor/operations/COM_ColorRampOperation.cc
M source/blender/compositor/operations/COM_ColorSpillOperation.cc
M source/blender/compositor/operations/COM_CompositorOperation.cc
M source/blender/compositor/operations/COM_ConstantOperation.cc
M source/blender/compositor/operations/COM_ConvertOperation.cc
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
M source/blender/compositor/operations/COM_CryptomatteOperation.cc
M source/blender/compositor/operations/COM_CurveBaseOperation.cc
M source/blender/compositor/operations/COM_DenoiseOperation.cc
M source/blender/compositor/operations/COM_DespeckleOperation.cc
M source/blender/compositor/operations/COM_DifferenceMatteOperation.cc
M source/blender/compositor/operations/COM_DilateErodeOperation.cc
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
M source/blender/compositor/operations/COM_DisplaceOperation.cc
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc
M source/blender/compositor/operations/COM_DotproductOperation.cc
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
M source/blender/compositor/operations/COM_GammaCorrectOperation.cc
M source/blender/compositor/operations/COM_GammaOperation.cc
M source/blender/compositor/operations/COM_GaussianXBlurOperation.h
M source/blender/compositor/operations/COM_GaussianYBlurOperation.h
M source/blender/compositor/operations/COM_GlareBaseOperation.cc
M source/blender/compositor/operations/COM_IDMaskOperation.cc
M source/blender/compositor/operations/COM_InpaintOperation.cc
M source/blender/compositor/operations/COM_InvertOperation.cc
M source/blender/compositor/operations/COM_KeyingBlurOperation.cc
M source/blender/compositor/operations/COM_KeyingClipOperation.cc
M source/blender/compositor/operations/COM_KeyingDespillOperation.cc
M source/blender/compositor/operations/COM_KeyingScreenOperation.cc
M source/blender/compositor/operations/COM_LuminanceMatteOperation.cc
M source/blender/compositor/operations/COM_MapRangeOperation.cc
M source/blender/compositor/operations/COM_MapUVOperation.cc
M source/blender/compositor/operations/COM_MapValueOperation.cc
M source/blender/compositor/operations/COM_MathBaseOperation.cc
M source/blender/compositor/operations/COM_MixOperation.cc
M source/blender/compositor/operations/COM_NormalizeOperation.cc
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
M source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
M source/blender/compositor/operations/COM_PosterizeOperation.cc
M source/blender/compositor/operations/COM_PreviewOperation.cc
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc
M source/blender/compositor/operations/COM_ReadBufferOperation.cc
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
M source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc
M source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc
M source/blender/compositor/operations/COM_SetColorOperation.cc
M source/blender/compositor/operations/COM_SetValueOperation.cc
M source/blender/compositor/operations/COM_SetVectorOperation.cc
M source/blender/compositor/operations/COM_SocketProxyOperation.cc
M source/blender/compositor/operations/COM_SunBeamsOperation.cc
M source/blender/compositor/operations/COM_TextureOperation.cc
M source/blender/compositor/operations/COM_TonemapOperation.cc
M source/blender/compositor/operations/COM_TrackPositionOperation.cc
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
M source/blender/compositor/operations/COM_VectorBlurOperation.cc
M source/blender/compositor/operations/COM_ViewerOperation.cc
M source/blender/compositor/operations/COM_WriteBufferOperation.cc
M source/blender/compositor/operations/COM_ZCombineOperation.cc
===================================================================
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<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_;
}
/**
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<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;
}
/**
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/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list