diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-01 18:08:18 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-01 18:08:18 +0400 |
commit | c9aa6cf80d0fce67ace4e2e43c5a39dc3cc4477f (patch) | |
tree | e3a8ddb0181b4cbed89e89e90604fb04a3064c98 /source/blender/blenkernel/BKE_node.h | |
parent | 1691414d44402c2730334a215c11e64351873967 (diff) | |
parent | 4fc4aa383b71a7d0a86eef29fd7ffa0383893f52 (diff) |
Merging r47307 through r47325 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index b8eb23b9760..351cb7dbb8b 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -156,6 +156,10 @@ typedef struct bNodeType { const char *(*labelfunc)(struct bNode *); /// Optional custom resize handle polling. int (*resize_area_func)(struct bNode *node, int x, int y); + /// Optional selection area polling. + int (*select_area_func)(struct bNode *node, int x, int y); + /// Optional tweak area polling (for grabbing). + int (*tweak_area_func)(struct bNode *node, int x, int y); /// Called when the node is updated in the editor. void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node); @@ -434,6 +438,7 @@ void node_type_compatibility(struct bNodeType *ntype, short compatibility); #define NODE_FORLOOP 3 #define NODE_WHILELOOP 4 #define NODE_FRAME 5 +#define NODE_REROUTE 6 /* 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); @@ -449,6 +454,7 @@ int node_group_ungroup(struct bNodeTree *ntree, struct bNode *gnode); /* in node_common.c */ void register_node_type_frame(struct bNodeTreeType *ttype); +void register_node_type_reroute(struct bNodeTreeType *ttype); /* ************** SHADER NODES *************** */ |