diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-24 13:47:29 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-24 13:47:29 +0400 |
commit | 14a56caee6c63822cb3af4471ed89e3ebefebc55 (patch) | |
tree | 4c1cf223f60370894006fc0e6fdc4f3f4f09e90c /source/blender/blenkernel/BKE_node.h | |
parent | e76812a1d7490b01066c0f751d5311b58825ffd8 (diff) | |
parent | 5f677f995d204c378f7aad3de826b2e193276487 (diff) |
Merging r46725 through r46963 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 20706e67e83..7e925e545dc 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -145,9 +145,13 @@ typedef struct bNodeType { void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr); /// Additional parameters in the side panel. void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr); + /// Additional drawing on backdrop. + void (*uibackdropfunc)(struct SpaceNode* snode, struct ImBuf* backdrop, struct bNode* node, int x, int y); + /// Draw a node socket. Default draws the input value button. NodeSocketButtonFunction drawinputfunc; NodeSocketButtonFunction drawoutputfunc; + /// Optional custom label function for the node header. const char *(*labelfunc)(struct bNode *); /// Optional custom resize handle polling. @@ -244,6 +248,12 @@ typedef struct bNodeType { #define NODE_OLD_SHADING 1 #define NODE_NEW_SHADING 2 +/* node resize directions */ +#define NODE_RESIZE_TOP 1 +#define NODE_RESIZE_BOTTOM 2 +#define NODE_RESIZE_RIGHT 4 +#define NODE_RESIZE_LEFT 8 + /* enum values for input/output */ #define SOCK_IN 1 #define SOCK_OUT 2 @@ -344,7 +354,8 @@ void nodeRemLink(struct bNodeTree *ntree, struct bNodeLink *link); void nodeRemSocketLinks(struct bNodeTree *ntree, struct bNodeSocket *sock); void nodeInternalRelink(struct bNodeTree *ntree, struct bNode *node); -void nodeSpaceCoords(struct bNode *node, float *locx, float *locy); +void nodeToView(struct bNode *node, float x, float y, float *rx, float *ry); +void nodeFromView(struct bNode *node, float x, float y, float *rx, float *ry); void nodeAttachNode(struct bNode *node, struct bNode *parent); void nodeDetachNode(struct bNode *node); @@ -512,6 +523,7 @@ struct ShadeResult; #define SH_NODE_TEX_CHECKER 164 #define SH_NODE_BRIGHTCONTRAST 165 #define SH_NODE_LIGHT_FALLOFF 166 +#define SH_NODE_OBJECT_INFO 167 /* custom defines options for Material node */ #define SH_NODE_MAT_DIFF 1 @@ -648,6 +660,13 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat); #define CMP_NODE_TONEMAP 302 #define CMP_NODE_LENSDIST 303 +#define CMP_NODE_COLORCORRECTION 312 +#define CMP_NODE_MASK_BOX 313 +#define CMP_NODE_MASK_ELLIPSE 314 +#define CMP_NODE_BOKEHIMAGE 315 +#define CMP_NODE_BOKEHBLUR 316 +#define CMP_NODE_SWITCH 317 + /* channel toggles */ #define CMP_CHAN_RGB 1 #define CMP_CHAN_A 2 @@ -675,7 +694,7 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat); struct CompBuf; struct bNodeTreeExec *ntreeCompositBeginExecTree(struct bNodeTree *ntree, int use_tree_data); void ntreeCompositEndExecTree(struct bNodeTreeExec *exec, int use_tree_data); -void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int do_previews); +void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int rendering, int do_previews); void ntreeCompositTagRender(struct Scene *sce); int ntreeCompositTagAnimated(struct bNodeTree *ntree); void ntreeCompositTagGenerators(struct bNodeTree *ntree); |