[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43359] trunk/blender/source/blender: Group DEM node code with the rest of the mattes, rather than the filters.

[Peter Larabell]

Revision: 43359
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43359
Author:   xglasyliax
Date:     2012-01-13 16:00:24 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Group DEM node code with the rest of the mattes, rather than the filters. Also fixes two typos in DEM node comments.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/nodes/NOD_composite.h
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2012-01-13 15:35:36 UTC (rev 43358)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2012-01-13 16:00:24 UTC (rev 43359)
@@ -1839,7 +1839,6 @@
 	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 @@
 	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);

Modified: trunk/blender/source/blender/nodes/NOD_composite.h
===================================================================
--- trunk/blender/source/blender/nodes/NOD_composite.h	2012-01-13 15:35:36 UTC (rev 43358)
+++ trunk/blender/source/blender/nodes/NOD_composite.h	2012-01-13 16:00:24 UTC (rev 43359)
@@ -80,7 +80,6 @@
 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_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);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c	2012-01-13 15:35:36 UTC (rev 43358)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c	2012-01-13 16:00:24 UTC (rev 43359)
@@ -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 @@
         }
 
         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...