Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-05-29 19:30:56 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-05-29 19:30:56 +0400
commite95885322d6e98cd23c538745b1d771101342f61 (patch)
tree1cccec2c06c44fbf7ecc0f59ff1a36145b62b327 /source/blender/compositor/intern/COM_Converter.cpp
parent7d04e4c53e5cd4888afd4177a9d70a6fc72c8e36 (diff)
Fix terrible mistake on merging keying patch which originally was against trunk.
This resulted in compositor crashes when using mask node.
Diffstat (limited to 'source/blender/compositor/intern/COM_Converter.cpp')
-rw-r--r--source/blender/compositor/intern/COM_Converter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index 747d6495f5d..92eb0f0f92c 100644
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@ -352,6 +352,7 @@ case CMP_NODE_OUTPUT_FILE:
break;
case CMP_NODE_MASK:
node = new MaskNode(bNode);
+ break;
case CMP_NODE_KEYINGSCREEN:
node = new KeyingScreenNode(bNode);
break;