[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47187] branches/soc-2011-tomato/source/ blender/compositor/intern/COM_Converter.cpp: Fix terrible mistake on merging keying patch which originally was against trunk .

[Sergey Sharybin]

Revision: 47187
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47187
Author:   nazgul
Date:     2012-05-29 15:30:56 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Fix terrible mistake on merging keying patch which originally was against trunk.
This resulted in compositor crashes when using mask node.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp

Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp	2012-05-29 15:04:11 UTC (rev 47186)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp	2012-05-29 15:30:56 UTC (rev 47187)
@@ -352,6 +352,7 @@
 		break;
 	case CMP_NODE_MASK:
 		node = new MaskNode(bNode);
+		break;
 	case CMP_NODE_KEYINGSCREEN:
 		node = new KeyingScreenNode(bNode);
 		break;