diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-07 17:21:04 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-07 17:21:04 +0400 |
commit | ec26abd2db934099bb2cc28510cf255775ae4ab1 (patch) | |
tree | ba77db5750dcefde5add1493605535b665fa9c0c /source/blender/blenkernel/BKE_node.h | |
parent | 8318acd1299a44e0b8fd80522993e5367ef2cf07 (diff) | |
parent | a02d7c1ba76adbf3ff432111af4c3c81a0812c3a (diff) |
Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index be9c359a13c..f61231141fd 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -89,6 +89,7 @@ typedef struct bNodeType { /* this line is set on startup of blender */ void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr); + void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr); const char *(*labelfunc)(struct bNode *); void (*initfunc)(struct bNode *); @@ -359,9 +360,10 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat); #define RRES_OUT_REFRACT 12 #define RRES_OUT_INDIRECT 13 #define RRES_OUT_INDEXOB 14 -#define RRES_OUT_MIST 15 -#define RRES_OUT_EMIT 16 -#define RRES_OUT_ENV 17 +#define RRES_OUT_INDEXMA 15 +#define RRES_OUT_MIST 16 +#define RRES_OUT_EMIT 17 +#define RRES_OUT_ENV 18 /* note: types are needed to restore callbacks, don't change values */ #define CMP_NODE_VIEWER 201 |