From e516d1d7182f2f244d0883560e43885a0b41d796 Mon Sep 17 00:00:00 2001
From: Peter Larabell <xgl.asyliax@gmail.com>
Date: Fri, 13 Jan 2012 16:00:24 +0000
Subject: [PATCH] Group DEM node code with the rest of the mattes, rather than
 the filters. Also fixes two typos in DEM node comments.

---
 source/blender/blenkernel/intern/node.c                       | 4 ++--
 source/blender/nodes/NOD_composite.h                          | 2 +-
 .../nodes/composite/nodes/node_composite_doubleEdgeMask.c     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 7a4b19915c3..359470eecf2 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1839,7 +1839,6 @@ static void registerCompositNodes(bNodeTreeType *ttype)
 	register_node_type_cmp_vecblur(ttype);
 	register_node_type_cmp_dilateerode(ttype);
 	register_node_type_cmp_defocus(ttype);
-	register_node_type_cmp_doubleedgemask(ttype);
 	
 	register_node_type_cmp_valtorgb(ttype);
 	register_node_type_cmp_rgbtobw(ttype);
@@ -1863,7 +1862,8 @@ static void registerCompositNodes(bNodeTreeType *ttype)
 	register_node_type_cmp_channel_matte(ttype);
 	register_node_type_cmp_color_spill(ttype);
 	register_node_type_cmp_luma_matte(ttype);
-	
+    register_node_type_cmp_doubleedgemask(ttype);
+
 	register_node_type_cmp_translate(ttype);
 	register_node_type_cmp_rotate(ttype);
 	register_node_type_cmp_scale(ttype);
diff --git a/source/blender/nodes/NOD_composite.h b/source/blender/nodes/NOD_composite.h
index 1cc9390b8be..77745a19934 100644
--- a/source/blender/nodes/NOD_composite.h
+++ b/source/blender/nodes/NOD_composite.h
@@ -80,7 +80,6 @@ void register_node_type_cmp_bilateralblur(struct bNodeTreeType *ttype);
 void register_node_type_cmp_vecblur(struct bNodeTreeType *ttype);
 void register_node_type_cmp_dilateerode(struct bNodeTreeType *ttype);
 void register_node_type_cmp_defocus(struct bNodeTreeType *ttype);
-void register_node_type_cmp_doubleedgemask(struct bNodeTreeType *ttype);
 
 void register_node_type_cmp_valtorgb(struct bNodeTreeType *ttype);
 void register_node_type_cmp_rgbtobw(struct bNodeTreeType *ttype);
@@ -104,6 +103,7 @@ void register_node_type_cmp_color_matte(struct bNodeTreeType *ttype);
 void register_node_type_cmp_channel_matte(struct bNodeTreeType *ttype);
 void register_node_type_cmp_color_spill(struct bNodeTreeType *ttype);
 void register_node_type_cmp_luma_matte(struct bNodeTreeType *ttype); 
+void register_node_type_cmp_doubleedgemask(struct bNodeTreeType *ttype);
 
 void register_node_type_cmp_translate(struct bNodeTreeType *ttype);
 void register_node_type_cmp_rotate(struct bNodeTreeType *ttype);
diff --git a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
index b7ebb7d291b..61d30a5ec4a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
@@ -29,7 +29,7 @@
  *  \ingroup cmpnodes
  */
 #include "node_composite_util.h"
-/* **************** DblEdgMatte  ******************** */
+/* **************** Double Edge Mask ******************** */
 
 
 static bNodeSocketTemplate cmp_node_doubleedgemask_in[]= {
@@ -1149,7 +1149,7 @@ static void node_composit_exec_doubleedgemask(void *UNUSED(data), bNode *node, b
         }
 
         isz=rsize[0];                  // set edge and gradient buffer sizes once again...
-        osz=rsize[1];                  // the sizes in rsize[] have been modified (always increased)
+        osz=rsize[1];                  // the sizes in rsize[] may have been modified
         gsz=rsize[2];                  // by the do_*EdgeDetection() function.
 
         // quick check for existance of edges in the buffer...