Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Castilla <manzanillawork@gmail.com>2021-10-14 00:01:53 +0300
committerManuel Castilla <manzanillawork@gmail.com>2021-10-14 00:41:14 +0300
commitf609b05b11cedb021fb05a89db124d979ab9de9b (patch)
tree60dbb95c66a44823efa170f61c5570f195c857a0 /source/blender/compositor/nodes
parent1c42d4930a24d639b3aa561b9a8b4bbce05977e0 (diff)
Cleanup: use `_` suffix for non-public data members in Compositor
For code style and clarity.
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r--source/blender/compositor/nodes/COM_CryptomatteNode.cc2
-rw-r--r--source/blender/compositor/nodes/COM_ImageNode.cc4
-rw-r--r--source/blender/compositor/nodes/COM_OutputFileNode.cc6
-rw-r--r--source/blender/compositor/nodes/COM_RenderLayersNode.cc2
4 files changed, 7 insertions, 7 deletions
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);
}
}