[Bf-blender-cvs] [2521d8c23e5] compositor-cryptomatte-workflow: Code-style: switch statement.
Jeroen Bakker
noreply at git.blender.org
Tue Feb 16 09:47:20 CET 2021
Commit: 2521d8c23e574b5d0a4f095905c6bf1b5fdd5ddf
Author: Jeroen Bakker
Date: Mon Feb 15 11:31:31 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB2521d8c23e574b5d0a4f095905c6bf1b5fdd5ddf
Code-style: switch statement.
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/compositor/nodes/COM_CryptomatteNode.cpp
M source/blender/makesdna/DNA_node_types.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index b450481ba21..f0525927bbb 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1237,15 +1237,10 @@ void ntreeGPUMaterialNodes(struct bNodeTree *localtree,
#define CMP_TRACKPOS_RELATIVE_FRAME 2
#define CMP_TRACKPOS_ABSOLUTE_FRAME 3
-/* cryptomatte source */
+/* Cryptomatte source. */
#define CMP_CRYPTOMATTE_SRC_RENDER 0
#define CMP_CRYPTOMATTE_SRC_IMAGE 1
-/* cryptomatte type */
-#define CMP_CRYPTOMATTE_TYPE_OBJECT 0
-#define CMP_CRYPTOMATTE_TYPE_MATERIAL 1
-#define CMP_CRYPTOMATTE_TYPE_ASSET 2
-
/* API */
void ntreeCompositExecTree(struct Scene *scene,
struct bNodeTree *ntree,
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
index 1eea6447947..3352bde22bc 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
@@ -57,10 +57,8 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter,
case CMP_CRYPTOMATTE_TYPE_ASSET:
prefix = "CryptoAsset";
break;
- default:
- BLI_assert(false);
- break;
}
+ BLI_assert(prefix[0] != '\0');
vector<NodeOperation *> input_operations;
if (node->custom1 == CMP_CRYPTOMATTE_SRC_RENDER) {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 001321b85d1..0145556905f 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1056,6 +1056,13 @@ typedef struct NodeSunBeams {
float ray_length;
} NodeSunBeams;
+/* NodeCryptomatte.type. */
+typedef enum eNodeCryptomatteLayerTypes {
+ CMP_CRYPTOMATTE_TYPE_OBJECT = 0,
+ CMP_CRYPTOMATTE_TYPE_MATERIAL = 1,
+ CMP_CRYPTOMATTE_TYPE_ASSET = 2,
+} eNodeCryptomatteLayerType;
+
typedef struct CryptomatteEntry {
struct CryptomatteEntry *next, *prev;
float encoded_hash;
More information about the Bf-blender-cvs
mailing list