diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-12 10:52:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-12 10:54:26 +0300 |
commit | 6cbccdd31ca60819e816f164a4828b113caddd73 (patch) | |
tree | 975adfd65151f3bd089fb25de9b3c05be447bdd0 /source/blender/blenkernel/BKE_node.h | |
parent | 60505728d9bff2963235fedc808d1e5e3b2a2ade (diff) |
Cleanup: unused defines
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 52 |
1 files changed, 14 insertions, 38 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 4522530780c..08a55036a03 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -220,18 +220,6 @@ typedef struct bNodeType { ExtensionRNA ext; } bNodeType; -/* node->exec, now in use for composites (#define for break is same as ready yes) */ -#define NODE_PROCESSING 1 -#define NODE_READY 2 -#define NODE_BREAK 2 -#define NODE_FINISHED 4 -#define NODE_FREEBUFS 8 -#define NODE_SKIPPED 16 - -/* sim_exec return value */ -#define NODE_EXEC_FINISHED 0 -#define NODE_EXEC_SUSPEND 1 - /* nodetype->nclass, for add-menu and themes */ #define NODE_CLASS_INPUT 0 #define NODE_CLASS_OUTPUT 1 @@ -239,22 +227,22 @@ typedef struct bNodeType { #define NODE_CLASS_OP_VECTOR 4 #define NODE_CLASS_OP_FILTER 5 #define NODE_CLASS_GROUP 6 -#define NODE_CLASS_FILE 7 +// #define NODE_CLASS_FILE 7 #define NODE_CLASS_CONVERTOR 8 #define NODE_CLASS_MATTE 9 #define NODE_CLASS_DISTORT 10 -#define NODE_CLASS_OP_DYNAMIC 11 /* deprecated */ +// #define NODE_CLASS_OP_DYNAMIC 11 /* deprecated */ #define NODE_CLASS_PATTERN 12 #define NODE_CLASS_TEXTURE 13 -#define NODE_CLASS_EXECUTION 14 -#define NODE_CLASS_GETDATA 15 -#define NODE_CLASS_SETDATA 16 -#define NODE_CLASS_MATH 17 -#define NODE_CLASS_MATH_VECTOR 18 -#define NODE_CLASS_MATH_ROTATION 19 -#define NODE_CLASS_PARTICLES 25 -#define NODE_CLASS_TRANSFORM 30 -#define NODE_CLASS_COMBINE 31 +// #define NODE_CLASS_EXECUTION 14 +// #define NODE_CLASS_GETDATA 15 +// #define NODE_CLASS_SETDATA 16 +// #define NODE_CLASS_MATH 17 +// #define NODE_CLASS_MATH_VECTOR 18 +// #define NODE_CLASS_MATH_ROTATION 19 +// #define NODE_CLASS_PARTICLES 25 +// #define NODE_CLASS_TRANSFORM 30 +// #define NODE_CLASS_COMBINE 31 #define NODE_CLASS_SCRIPT 32 #define NODE_CLASS_INTERFACE 33 #define NODE_CLASS_SHADER 40 @@ -624,8 +612,8 @@ bool BKE_node_is_connected_to_output(struct bNodeTree *ntree, struct bNode *node #define NODE_UNDEFINED -2 /* node type is not registered */ #define NODE_CUSTOM -1 /* for dynamically registered custom types */ #define NODE_GROUP 2 -#define __NODE_FORLOOP 3 /* deprecated */ -#define __NODE_WHILELOOP 4 /* deprecated */ +// #define NODE_FORLOOP 3 /* deprecated */ +// #define NODE_WHILELOOP 4 /* deprecated */ #define NODE_FRAME 5 #define NODE_REROUTE 6 #define NODE_GROUP_INPUT 7 @@ -802,15 +790,6 @@ struct ShadeResult; #define SH_NODE_MAT_DIFF 1 #define SH_NODE_MAT_SPEC 2 #define SH_NODE_MAT_NEG 4 -/* custom defines: states for Script node. These are bit indices */ -#define NODE_DYNAMIC_READY 0 /* 1 */ -#define NODE_DYNAMIC_LOADED 1 /* 2 */ -#define NODE_DYNAMIC_NEW 2 /* 4 */ -#define NODE_DYNAMIC_UPDATED 3 /* 8 */ -#define NODE_DYNAMIC_ADDEXIST 4 /* 16 */ -#define NODE_DYNAMIC_ERROR 5 /* 32 */ -#define NODE_DYNAMIC_REPARSE 6 /* 64 */ -#define NODE_DYNAMIC_SET 15 /* sign */ /* API */ @@ -906,7 +885,7 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMateria #define CMP_NODE_CHANNEL_MATTE 238 #define CMP_NODE_FLIP 239 #define CMP_NODE_SPLITVIEWER 240 -#define CMP_NODE_INDEX_MASK 241 +// #define CMP_NODE_INDEX_MASK 241 #define CMP_NODE_MAP_UV 242 #define CMP_NODE_ID_MASK 243 #define CMP_NODE_DEFOCUS 244 @@ -961,9 +940,6 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMateria /* channel toggles */ #define CMP_CHAN_RGB 1 #define CMP_CHAN_A 2 -#define CMP_CHAN_R 4 -#define CMP_CHAN_G 8 -#define CMP_CHAN_B 16 /* filter types */ #define CMP_FILT_SOFT 0 |