diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
commit | 9149e8942107343fb31639406124428e6ff1a029 (patch) | |
tree | d33495dc55c5d50206437598ddcfffa24843be61 /source/blender/makesdna/DNA_node_types.h | |
parent | ea33b90a1bf21061ab8a862d862db4dea048b28c (diff) | |
parent | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (diff) |
Merge branch 'master' into blende2.8
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index fe921cf96ac..32792fcd85d 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -158,15 +158,15 @@ typedef enum eNodeSocketInOut { /* sock->flag, first bit is select */ typedef enum eNodeSocketFlag { - SOCK_HIDDEN = 2, /* hidden is user defined, to hide unused */ - SOCK_IN_USE = 4, /* for quick check if socket is linked */ - SOCK_UNAVAIL = 8, /* unavailable is for dynamic sockets */ - // SOCK_DYNAMIC = 16, /* DEPRECATED dynamic socket (can be modified by user) */ - // SOCK_INTERNAL = 32, /* DEPRECATED group socket should not be exposed */ - SOCK_COLLAPSED = 64, /* socket collapsed in UI */ - SOCK_HIDE_VALUE = 128, /* hide socket value, if it gets auto default */ - SOCK_AUTO_HIDDEN__DEPRECATED = 256, /* socket hidden automatically, to distinguish from manually hidden */ - SOCK_NO_INTERNAL_LINK = 512 + SOCK_HIDDEN = (1 << 1), /* hidden is user defined, to hide unused */ + SOCK_IN_USE = (1 << 2), /* for quick check if socket is linked */ + SOCK_UNAVAIL = (1 << 3), /* unavailable is for dynamic sockets */ + // SOCK_DYNAMIC = (1 << 4), /* DEPRECATED dynamic socket (can be modified by user) */ + // SOCK_INTERNAL = (1 << 5), /* DEPRECATED group socket should not be exposed */ + SOCK_COLLAPSED = (1 << 6), /* socket collapsed in UI */ + SOCK_HIDE_VALUE = (1 << 7), /* hide socket value, if it gets auto default */ + SOCK_AUTO_HIDDEN__DEPRECATED = (1 << 8), /* socket hidden automatically, to distinguish from manually hidden */ + SOCK_NO_INTERNAL_LINK = (1 << 9), } eNodeSocketFlag; /* limit data in bNode to what we want to see saved? */ @@ -317,9 +317,9 @@ typedef struct bNodeLink { } bNodeLink; /* link->flag */ -#define NODE_LINKFLAG_HILITE 1 /* link has been successfully validated */ -#define NODE_LINK_VALID 2 -#define NODE_LINK_TEST 4 /* free test flag, undefined */ +#define NODE_LINKFLAG_HILITE (1 << 0) /* link has been successfully validated */ +#define NODE_LINK_VALID (1 << 1) +#define NODE_LINK_TEST (1 << 2) /* free test flag, undefined */ /* tree->edit_quality/tree->render_quality */ #define NTREE_QUALITY_HIGH 0 @@ -414,29 +414,34 @@ typedef struct bNodeTree { #define NTREE_TYPE_INIT 1 /* ntree->flag */ -#define NTREE_DS_EXPAND 1 /* for animation editors */ -#define NTREE_COM_OPENCL 2 /* use opencl */ -#define NTREE_TWO_PASS 4 /* two pass */ -#define NTREE_COM_GROUPNODE_BUFFER 8 /* use groupnode buffers */ -#define NTREE_VIEWER_BORDER 16 /* use a border for viewer nodes */ +#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */ +#define NTREE_COM_OPENCL (1 << 1) /* use opencl */ +#define NTREE_TWO_PASS (1 << 2) /* two pass */ +#define NTREE_COM_GROUPNODE_BUFFER (1 << 3) /* use groupnode buffers */ +#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */ /* NOTE: DEPRECATED, use (id->tag & LIB_TAG_LOCALIZED) instead. */ -/*#define NTREE_IS_LOCALIZED 32*/ /* tree is localized copy, free when deleting node groups */ +/* #define NTREE_IS_LOCALIZED (1 << 5) */ /* tree is localized copy, free when deleting node groups */ /* XXX not nice, but needed as a temporary flags * for group updates after library linking. */ -#define NTREE_DO_VERSIONS_GROUP_EXPOSE_2_56_2 1024 /* changes from r35033 */ -#define NTREE_DO_VERSIONS_CUSTOMNODES_GROUP 2048 /* custom_nodes branch: remove links to node tree sockets */ -#define NTREE_DO_VERSIONS_CUSTOMNODES_GROUP_CREATE_INTERFACE 4096 /* custom_nodes branch: create group input/output nodes */ + +/* changes from r35033 */ +#define NTREE_DO_VERSIONS_GROUP_EXPOSE_2_56_2 (1 << 10) +/* custom_nodes branch: remove links to node tree sockets */ +#define NTREE_DO_VERSIONS_CUSTOMNODES_GROUP (1 << 11) +/* custom_nodes branch: create group input/output nodes */ +#define NTREE_DO_VERSIONS_CUSTOMNODES_GROUP_CREATE_INTERFACE (1 << 12) /* ntree->update */ typedef enum eNodeTreeUpdate { NTREE_UPDATE = 0xFFFF, /* generic update flag (includes all others) */ - NTREE_UPDATE_LINKS = 1, /* links have been added or removed */ - NTREE_UPDATE_NODES = 2, /* nodes or sockets have been added or removed */ - NTREE_UPDATE_GROUP_IN = 16, /* group inputs have changed */ - NTREE_UPDATE_GROUP_OUT = 32, /* group outputs have changed */ - NTREE_UPDATE_GROUP = 48 /* group has changed (generic flag including all other group flags) */ + NTREE_UPDATE_LINKS = (1 << 0), /* links have been added or removed */ + NTREE_UPDATE_NODES = (1 << 1), /* nodes or sockets have been added or removed */ + NTREE_UPDATE_GROUP_IN = (1 << 4), /* group inputs have changed */ + NTREE_UPDATE_GROUP_OUT = (1 << 5), /* group outputs have changed */ + /* group has changed (generic flag including all other group flags) */ + NTREE_UPDATE_GROUP = (NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_GROUP_OUT) } eNodeTreeUpdate; @@ -486,10 +491,10 @@ enum { }; enum { - CMP_NODE_LENSFLARE_GHOST = 1, - CMP_NODE_LENSFLARE_GLOW = 2, - CMP_NODE_LENSFLARE_CIRCLE = 4, - CMP_NODE_LENSFLARE_STREAKS = 8 + CMP_NODE_LENSFLARE_GHOST = (1 << 0), + CMP_NODE_LENSFLARE_GLOW = (1 << 1), + CMP_NODE_LENSFLARE_CIRCLE = (1 << 2), + CMP_NODE_LENSFLARE_STREAKS = (1 << 3) }; enum { |