[Bf-blender-cvs] [61be7beced1] compositor-cryptomatte-workflow: Cleanup: code style

Jeroen Bakker noreply at git.blender.org
Wed Mar 10 15:37:30 CET 2021


Commit: 61be7beced18ab90491b942c6d23c424662ea9fd
Author: Jeroen Bakker
Date:   Wed Mar 10 15:37:20 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB61be7beced18ab90491b942c6d23c424662ea9fd

Cleanup: code style

===================================================================

M	source/blender/compositor/nodes/COM_CryptomatteNode.cc
M	source/blender/compositor/nodes/COM_CryptomatteNode.h

===================================================================

diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
index d052b097963..55a666256f1 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
@@ -76,7 +76,7 @@ void CryptomatteBaseNode::convertToOperations(NodeConverter &converter,
 /** \name Cryptomatte V2
  * \{ */
 
-void CryptomatteNode::buildInputOperationsFromRenderSource(
+void CryptomatteNode::input_operations_from_render_source(
     const CompositorContext &context,
     const bNode &node,
     blender::Vector<NodeOperation *> &r_input_operations)
@@ -121,7 +121,7 @@ void CryptomatteNode::buildInputOperationsFromRenderSource(
   RE_ReleaseResult(render);
 }
 
-void CryptomatteNode::buildInputOperationsFromImageSource(
+void CryptomatteNode::input_operations_from_image_source(
     const CompositorContext &context,
     const bNode &node,
     blender::Vector<NodeOperation *> &r_input_operations)
@@ -182,16 +182,16 @@ void CryptomatteNode::buildInputOperationsFromImageSource(
   BKE_image_release_ibuf(image, ibuf, nullptr);
 }
 
-blender::Vector<NodeOperation *> CryptomatteNode::createInputOperations(
+blender::Vector<NodeOperation *> CryptomatteNode::create_input_operations(
     const CompositorContext &context, const bNode &node)
 {
   blender::Vector<NodeOperation *> input_operations;
   switch (node.custom1) {
     case CMP_CRYPTOMATTE_SRC_RENDER:
-      buildInputOperationsFromRenderSource(context, node, input_operations);
+      input_operations_from_render_source(context, node, input_operations);
       break;
     case CMP_CRYPTOMATTE_SRC_IMAGE:
-      buildInputOperationsFromImageSource(context, node, input_operations);
+      input_operations_from_image_source(context, node, input_operations);
       break;
   }
 
@@ -211,7 +211,7 @@ CryptomatteOperation *CryptomatteNode::create_cryptomatte_operation(
     const bNode &node,
     const NodeCryptomatte *cryptomatte_settings) const
 {
-  blender::Vector<NodeOperation *> input_operations = createInputOperations(context, node);
+  blender::Vector<NodeOperation *> input_operations = create_input_operations(context, node);
   CryptomatteOperation *operation = new CryptomatteOperation(input_operations.size());
   LISTBASE_FOREACH (CryptomatteEntry *, cryptomatte_entry, &cryptomatte_settings->entries) {
     operation->addObjectIndex(cryptomatte_entry->encoded_hash);
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.h b/source/blender/compositor/nodes/COM_CryptomatteNode.h
index 7da07552f92..e99a104c914 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.h
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h
@@ -61,14 +61,13 @@ class CryptomatteNode : public CryptomatteBaseNode {
       const NodeCryptomatte *cryptomatte_settings) const override;
 
  private:
-  static blender::Vector<NodeOperation *> createInputOperations(const CompositorContext &context,
-                                                                const bNode &node);
-  static blender::StringRef getCryptomatteLayerPrefix(const bNode &node);
-  static void buildInputOperationsFromRenderSource(
+  static blender::Vector<NodeOperation *> create_input_operations(const CompositorContext &context,
+                                                                  const bNode &node);
+  static void input_operations_from_render_source(
       const CompositorContext &context,
       const bNode &node,
       blender::Vector<NodeOperation *> &r_input_operations);
-  static void buildInputOperationsFromImageSource(
+  static void input_operations_from_image_source(
       const CompositorContext &context,
       const bNode &node,
       blender::Vector<NodeOperation *> &r_input_operations);



More information about the Bf-blender-cvs mailing list