[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43383] branches/tile/source/blender/ compositor/intern/COM_Converter.cpp: fix compile: doubleedgemask define will only be available when trunk get merged in tile again

[Dalai Felinto]

Revision: 43383
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43383
Author:   dfelinto
Date:     2012-01-14 20:11:05 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
fix compile: doubleedgemask define will only be available when trunk get merged in tile again

Modified Paths:
--------------
    branches/tile/source/blender/compositor/intern/COM_Converter.cpp

Modified: branches/tile/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Converter.cpp	2012-01-14 18:52:34 UTC (rev 43382)
+++ branches/tile/source/blender/compositor/intern/COM_Converter.cpp	2012-01-14 20:11:05 UTC (rev 43383)
@@ -298,7 +298,7 @@
 	case CMP_NODE_OUTPUT_FILE:
 	case CMP_NODE_COLOR_SPILL:
 	case CMP_NODE_CHANNEL_MATTE:
-	case CMP_NODE_DOUBLEEDGEMASK:
+//	case CMP_NODE_DOUBLEEDGEMASK: // to be re-enabled with next merge from trunk
 	case CMP_NODE_DEFOCUS:
 	case CMP_NODE_DISPLACE:
 	case CMP_NODE_NORMALIZE: