diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-14 16:19:13 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-14 16:19:13 +0400 |
commit | 1f19bacf8ee39b779b4e2940bed758ade1191ee2 (patch) | |
tree | 6182f55adf381a3632376d0b236e6751d8a629ee /source/blender/blenkernel/BKE_node.h | |
parent | d56e77ada59050d02a03b44e9d5a7b122683615f (diff) | |
parent | 075b35572ecaa6e6e47e2e6e97c3711df74580ed (diff) |
Kaying node from tomato branch
Merge keying node from tomato branch into trunk.
It was considered stable and helpful by Mango team and it'll help
studio pipeline, because nodes would stop disappearing when opening
files in current trunk.
Full information about keying nodes could be found there:
http://wiki.blender.org/index.php/User:Nazg-gul/Keying
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index bf708fc550d..c856d407f05 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -659,6 +659,7 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat); #define CMP_NODE_OUTPUT_MULTI_FILE__DEPRECATED 267 /* DEPRECATED multi file node has been merged into regular CMP_NODE_OUTPUT_FILE */ #define CMP_NODE_MASK 268 #define CMP_NODE_KEYINGSCREEN 269 +#define CMP_NODE_KEYING 270 #define CMP_NODE_GLARE 301 #define CMP_NODE_TONEMAP 302 |