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/compositor/intern/COM_Converter.cpp | |
| 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/compositor/intern/COM_Converter.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_Converter.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index 082e2fe5d04..9731555039c 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -113,6 +113,7 @@ #include "COM_CropNode.h" #include "COM_MaskNode.h" #include "COM_KeyingScreenNode.h" +#include "COM_KeyingNode.h" Node *Converter::convert(bNode *bNode) { @@ -355,6 +356,9 @@ case CMP_NODE_OUTPUT_FILE: case CMP_NODE_KEYINGSCREEN: node = new KeyingScreenNode(bNode); break; + case CMP_NODE_KEYING: + node = new KeyingNode(bNode); + break; /* not inplemented yet */ default: node = new MuteNode(bNode); |