diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-29 19:02:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-29 19:02:21 +0400 |
| commit | 7d04e4c53e5cd4888afd4177a9d70a6fc72c8e36 (patch) | |
| tree | 9877850d4e9b86a36f787f2f730668617b42a1b4 /source/blender/blenkernel/BKE_node.h | |
| parent | ec4f6750557218be262cacea53ef4cb0ccaa0671 (diff) | |
| parent | feb3dc926a74b51789b100ac9532dc196a4cd9ae (diff) | |
svn merge ^/trunk/blender -r47150:47184
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index fde6d93849d..b8eb23b9760 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -229,7 +229,7 @@ typedef struct bNodeType { #define NODE_CLASS_CONVERTOR 8 #define NODE_CLASS_MATTE 9 #define NODE_CLASS_DISTORT 10 -#define NODE_CLASS_OP_DYNAMIC 11 +#define NODE_CLASS_OP_DYNAMIC 11 /* deprecated */ #define NODE_CLASS_PATTERN 12 #define NODE_CLASS_TEXTURE 13 #define NODE_CLASS_EXECUTION 14 @@ -434,8 +434,6 @@ void node_type_compatibility(struct bNodeType *ntype, short compatibility); #define NODE_FORLOOP 3 #define NODE_WHILELOOP 4 #define NODE_FRAME 5 -#define NODE_GROUP_MENU 10000 -#define NODE_DYNAMIC_MENU 20000 /* look up a socket on a group node by the internal group socket */ struct bNodeSocket *node_group_find_input(struct bNode *gnode, struct bNodeSocket *gsock); |