Group DEM node code with the rest of the mattes, rather than the filters. Also fixes...
authorPeter Larabell <xgl.asyliax@gmail.com>
Fri, 13 Jan 2012 16:00:24 +0000 (16:00 +0000)
committerPeter Larabell <xgl.asyliax@gmail.com>
Fri, 13 Jan 2012 16:00:24 +0000 (16:00 +0000)
source/blender/blenkernel/intern/node.c
source/blender/nodes/NOD_composite.h
source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c

index 7a4b19915c3d4dce8d7e520d5b442bb96d2ac7b8..359470eecf2223359390ff6a22017aa8f578d792 100644 (file)
@@ -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);
index 1cc9390b8beaffa0a3bceffc83e698cd4c9a3ebc..77745a19934d4e0e8a6ee75b6e946dcc10ad0014 100644 (file)
@@ -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);
index b7ebb7d291b42131fddd62580f01b0533b075523..61d30a5ec4a58206a417d309005a01e5f61d8243 100644 (file)
@@ -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...