Simple preset function for setting common node sizes based on enum instead of explici...
authorLukas Toenne <lukas.toenne@googlemail.com>
Fri, 22 Feb 2013 10:46:27 +0000 (10:46 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Fri, 22 Feb 2013 10:46:27 +0000 (10:46 +0000)
Most nodes use the default size now and don't need explicit function calls. Most remaining nodes can also use the preset variant instead of explicit size values, these are only needed for a few special nodes.
Thanks to Sebastian K├Ânig for suggesting this and doing the monkey work of changing node definitions.

74 files changed:
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/nodes/composite/nodes/node_composite_alphaOver.c
source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
source/blender/nodes/composite/nodes/node_composite_blur.c
source/blender/nodes/composite/nodes/node_composite_bokehblur.c
source/blender/nodes/composite/nodes/node_composite_bokehimage.c
source/blender/nodes/composite/nodes/node_composite_boxmask.c
source/blender/nodes/composite/nodes/node_composite_brightness.c
source/blender/nodes/composite/nodes/node_composite_channelMatte.c
source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
source/blender/nodes/composite/nodes/node_composite_colorMatte.c
source/blender/nodes/composite/nodes/node_composite_colorSpill.c
source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
source/blender/nodes/composite/nodes/node_composite_composite.c
source/blender/nodes/composite/nodes/node_composite_crop.c
source/blender/nodes/composite/nodes/node_composite_defocus.c
source/blender/nodes/composite/nodes/node_composite_despeckle.c
source/blender/nodes/composite/nodes/node_composite_diffMatte.c
source/blender/nodes/composite/nodes/node_composite_dilate.c
source/blender/nodes/composite/nodes/node_composite_directionalblur.c
source/blender/nodes/composite/nodes/node_composite_displace.c
source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
source/blender/nodes/composite/nodes/node_composite_filter.c
source/blender/nodes/composite/nodes/node_composite_flip.c
source/blender/nodes/composite/nodes/node_composite_gamma.c
source/blender/nodes/composite/nodes/node_composite_glare.c
source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
source/blender/nodes/composite/nodes/node_composite_huecorrect.c
source/blender/nodes/composite/nodes/node_composite_idMask.c
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/nodes/composite/nodes/node_composite_inpaint.c
source/blender/nodes/composite/nodes/node_composite_invert.c
source/blender/nodes/composite/nodes/node_composite_keying.c
source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
source/blender/nodes/composite/nodes/node_composite_lensdist.c
source/blender/nodes/composite/nodes/node_composite_levels.c
source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
source/blender/nodes/composite/nodes/node_composite_mapRange.c
source/blender/nodes/composite/nodes/node_composite_mapUV.c
source/blender/nodes/composite/nodes/node_composite_mapValue.c
source/blender/nodes/composite/nodes/node_composite_mask.c
source/blender/nodes/composite/nodes/node_composite_math.c
source/blender/nodes/composite/nodes/node_composite_mixrgb.c
source/blender/nodes/composite/nodes/node_composite_movieclip.c
source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
source/blender/nodes/composite/nodes/node_composite_normal.c
source/blender/nodes/composite/nodes/node_composite_normalize.c
source/blender/nodes/composite/nodes/node_composite_outputFile.c
source/blender/nodes/composite/nodes/node_composite_pixelate.c
source/blender/nodes/composite/nodes/node_composite_premulkey.c
source/blender/nodes/composite/nodes/node_composite_rgb.c
source/blender/nodes/composite/nodes/node_composite_rotate.c
source/blender/nodes/composite/nodes/node_composite_scale.c
source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
source/blender/nodes/composite/nodes/node_composite_setalpha.c
source/blender/nodes/composite/nodes/node_composite_splitViewer.c
source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
source/blender/nodes/composite/nodes/node_composite_switch.c
source/blender/nodes/composite/nodes/node_composite_texture.c
source/blender/nodes/composite/nodes/node_composite_tonemap.c
source/blender/nodes/composite/nodes/node_composite_trackpos.c
source/blender/nodes/composite/nodes/node_composite_transform.c
source/blender/nodes/composite/nodes/node_composite_translate.c
source/blender/nodes/composite/nodes/node_composite_valToRgb.c
source/blender/nodes/composite/nodes/node_composite_value.c
source/blender/nodes/composite/nodes/node_composite_vecBlur.c
source/blender/nodes/composite/nodes/node_composite_viewer.c
source/blender/nodes/composite/nodes/node_composite_zcombine.c

index 5024b36..19fe621 100644 (file)
@@ -261,6 +261,12 @@ typedef struct bNodeType {
 #define SOCK_IN                1
 #define SOCK_OUT       2
 
+typedef enum eNodeSizePreset {
+       NODE_SIZE_DEFAULT,
+       NODE_SIZE_SMALL,
+       NODE_SIZE_LARGE
+} eNodeSizePreset;
+
 struct bNodeTreeExec;
 
 typedef void (*bNodeTreeCallback)(void *calldata, struct ID *owner_id, struct bNodeTree *ntree);
@@ -419,6 +425,7 @@ void            node_type_base(struct bNodeTreeType *ttype, struct bNodeType *nt
                                const char *name, short nclass, short flag);
 void            node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTemplate *inputs, struct bNodeSocketTemplate *outputs);
 void            node_type_size(struct bNodeType *ntype, int width, int minwidth, int maxwidth);
+void            node_type_size_preset(struct bNodeType *ntype, eNodeSizePreset size);
 void            node_type_init(struct bNodeType *ntype, void (*initfunc)(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp));
 void            node_type_valid(struct bNodeType *ntype, int (*validfunc)(struct bNodeTree *ntree, struct bNodeTemplate *ntemp));
 void            node_type_storage(struct bNodeType *ntype,
index 97bee32..86fe472 100644 (file)
@@ -2028,9 +2028,8 @@ void node_type_base(bNodeTreeType *ttype, bNodeType *ntype, int type, const char
                ntype->update_internal_links = ttype->update_internal_links;
 
        /* default size values */
-       ntype->width = 140;
-       ntype->minwidth = 100;
-       ntype->maxwidth = 320;
+       node_type_size_preset(ntype, NODE_SIZE_DEFAULT);
+       
        ntype->height = 100;
        ntype->minheight = 30;
        ntype->maxheight = FLT_MAX;
@@ -2062,6 +2061,21 @@ void node_type_size(struct bNodeType *ntype, int width, int minwidth, int maxwid
                ntype->maxwidth = maxwidth;
 }
 
+void node_type_size_preset(struct bNodeType *ntype, eNodeSizePreset size)
+{
+       switch (size) {
+               case NODE_SIZE_DEFAULT:
+                       node_type_size(ntype, 140, 100, 320);
+                       break;
+               case NODE_SIZE_SMALL:
+                       node_type_size(ntype, 100, 80, 320);
+                       break;
+               case NODE_SIZE_LARGE:
+                       node_type_size(ntype, 140, 120, 500);
+                       break;
+       }
+}
+
 void node_type_storage(bNodeType *ntype, const char *storagename, void (*freestoragefunc)(struct bNode *), void (*copystoragefunc)(struct bNode *, struct bNode *))
 {
        if (storagename)
index 3722ad1..2176706 100644 (file)
@@ -54,7 +54,6 @@ void register_node_type_cmp_alphaover(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_alphaover_in, cmp_node_alphaover_out);
-       node_type_size(&ntype, 80, 40, 160);
        node_type_init(&ntype, node_alphaover_init);
        node_type_storage(&ntype, "NodeTwoFloats", node_free_standard_storage, node_copy_standard_storage);
 
index 34cc9a9..b8bf379 100644 (file)
@@ -57,7 +57,6 @@ void register_node_type_cmp_bilateralblur(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_bilateralblur_in, cmp_node_bilateralblur_out);
-       node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_bilateralblur);
        node_type_storage(&ntype, "NodeBilateralBlurData", node_free_standard_storage, node_copy_standard_storage);
 
index 9d19f96..20fce05 100644 (file)
@@ -57,7 +57,6 @@ void register_node_type_cmp_blur(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW | NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_blur_in, cmp_node_blur_out);
-       node_type_size(&ntype, 120, 80, 200);
        node_type_init(&ntype, node_composit_init_blur);
        node_type_storage(&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
 
index 222ac7a..ea3162a 100644 (file)
@@ -61,7 +61,6 @@ void register_node_type_cmp_bokehblur(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_bokehblur_in, cmp_node_bokehblur_out);
-       node_type_size(&ntype, 120, 80, 200);
        node_type_init(&ntype, node_composit_init_bokehblur);
        
        nodeRegisterType(ttype, &ntype);
index fa21e12..b006280 100644 (file)
@@ -58,7 +58,6 @@ void register_node_type_cmp_bokehimage(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_bokehimage_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_bokehimage);
        node_type_storage(&ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage);
 
index d3c6b2c..eb2c588 100644 (file)
@@ -61,7 +61,6 @@ void register_node_type_cmp_boxmask(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MASK_BOX, "Box Mask", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_boxmask_in, cmp_node_boxmask_out);
-       node_type_size(&ntype, 260, 110, 300);
        node_type_init(&ntype, node_composit_init_boxmask);
        node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage);
 
index 719423e..025f5c0 100644 (file)
@@ -54,7 +54,6 @@ void register_node_type_cmp_brightcontrast(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_brightcontrast_in, cmp_node_brightcontrast_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index bfeeb7d..acb0566 100644 (file)
@@ -66,7 +66,6 @@ void register_node_type_cmp_channel_matte(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_channel_matte_in, cmp_node_channel_matte_out);
-       node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_channel_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
index 83c8bbc..29782c3 100644 (file)
@@ -62,7 +62,6 @@ void register_node_type_cmp_chroma_matte(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_chroma_in, cmp_node_chroma_out);
-       node_type_size(&ntype, 200, 80, 300);
        node_type_init(&ntype, node_composit_init_chroma_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
index 1642d92..9905a24 100644 (file)
@@ -62,7 +62,6 @@ void register_node_type_cmp_color_matte(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_color_in, cmp_node_color_out);
-       node_type_size(&ntype, 200, 80, 300);
        node_type_init(&ntype, node_composit_init_color_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
index 3679a65..32fa446 100644 (file)
@@ -60,7 +60,6 @@ void register_node_type_cmp_color_spill(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_COLOR_SPILL, "Color Spill", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_color_spill_in, cmp_node_color_spill_out);
-       node_type_size(&ntype, 140, 80, 200);
        node_type_init(&ntype, node_composit_init_color_spill);
        node_type_storage(&ntype, "NodeColorspill", node_free_standard_storage, node_copy_standard_storage);
 
index 526f847..19f2fad 100644 (file)
@@ -81,7 +81,7 @@ void register_node_type_cmp_colorcorrection(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COLORCORRECTION, "Color Correction", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_colorcorrection_in, cmp_node_colorcorrection_out);
-       node_type_size(&ntype, 400, 200, 500);
+       node_type_size(&ntype, 400, 200, 600);
        node_type_init(&ntype, node_composit_init_colorcorrection);
        node_type_storage(&ntype, "NodeColorCorrection", node_free_standard_storage, node_copy_standard_storage);
 
index 6cff403..ea281a3 100644 (file)
@@ -45,7 +45,6 @@ void register_node_type_cmp_composite(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COMPOSITE, "Composite", NODE_CLASS_OUTPUT, NODE_OPTIONS | NODE_PREVIEW);
        node_type_socket_templates(&ntype, cmp_node_composite_in, NULL);
-       node_type_size(&ntype, 80, 60, 200);
 
        /* Do not allow muting for this node. */
        node_type_internal_links(&ntype, NULL);
index 90d48a5..10af554 100644 (file)
@@ -59,7 +59,6 @@ void register_node_type_cmp_crop(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_CROP, "Crop", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_crop_in, cmp_node_crop_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_crop);
        node_type_storage(&ntype, "NodeTwoXYs", node_free_standard_storage, node_copy_standard_storage);
 
index 88787cc..c05f1d6 100644 (file)
@@ -67,7 +67,6 @@ void register_node_type_cmp_defocus(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DEFOCUS, "Defocus", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_defocus_in, cmp_node_defocus_out);
-       node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_defocus);
        node_type_storage(&ntype, "NodeDefocus", node_free_standard_storage, node_copy_standard_storage);
 
index 8fc97ef..816a180 100644 (file)
@@ -54,7 +54,6 @@ void register_node_type_cmp_despeckle(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DESPECKLE, "Despeckle", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_despeckle_in, cmp_node_despeckle_out);
-       node_type_size(&ntype, 80, 40, 120);
        node_type_init(&ntype, node_composit_init_despeckle);
 
        nodeRegisterType(ttype, &ntype);
index bcfd9dd..29712d5 100644 (file)
@@ -59,7 +59,6 @@ void register_node_type_cmp_diff_matte(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DIFF_MATTE, "Difference Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_diff_matte_in, cmp_node_diff_matte_out);
-       node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_diff_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
index 0238914..fabc54f 100644 (file)
@@ -57,7 +57,6 @@ void register_node_type_cmp_dilateerode(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_DILATEERODE, "Dilate/Erode", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_dilateerode_in, cmp_node_dilateerode_out);
-       node_type_size(&ntype, 130, 100, 320);
        node_type_init(&ntype, node_composit_init_dilateerode);
        
        node_type_storage(&ntype, "NodeDilateErode", node_free_standard_storage, node_copy_standard_storage);
index ca32f37..6197d78 100644 (file)
@@ -56,7 +56,6 @@ void register_node_type_cmp_dblur(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DBLUR, "Directional Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_dblur_in, cmp_node_dblur_out);
-       node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_dblur);
        node_type_storage(&ntype, "NodeDBlurData", node_free_standard_storage, node_copy_standard_storage);
 
index 5955967..251345d 100644 (file)
@@ -53,7 +53,6 @@ void register_node_type_cmp_displace(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DISPLACE, "Displace", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_displace_in, cmp_node_displace_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index fffb85c..26f8055 100644 (file)
@@ -60,7 +60,6 @@ void register_node_type_cmp_distance_matte(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DIST_MATTE, "Distance Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_distance_matte_in, cmp_node_distance_matte_out);
-       node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_distance_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
index 4f42c40..d5dd63a 100644 (file)
@@ -48,7 +48,6 @@ void register_node_type_cmp_doubleedgemask(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_DOUBLEEDGEMASK, "Double Edge Mask", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_doubleedgemask_in, cmp_node_doubleedgemask_out);
-       node_type_size(&ntype, 210, 210, 210);
 
        nodeRegisterType(ttype, &ntype);
 }
index 761b0b1..c2e34dc 100644 (file)
@@ -61,7 +61,7 @@ void register_node_type_cmp_ellipsemask(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MASK_ELLIPSE, "Ellipse Mask", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_ellipsemask_in, cmp_node_ellipsemask_out);
-       node_type_size(&ntype, 260, 110, 300);
+       node_type_size(&ntype, 260, 110, 320);
        node_type_init(&ntype, node_composit_init_ellipsemask);
        node_type_storage(&ntype, "NodeEllipseMask", node_free_standard_storage, node_copy_standard_storage);
 
index 338bfc0..3ecc728 100644 (file)
@@ -49,7 +49,6 @@ void register_node_type_cmp_filter(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_FILTER, "Filter", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_filter_in, cmp_node_filter_out);
-       node_type_size(&ntype, 80, 40, 120);
        node_type_label(&ntype, node_filter_label);
 
        nodeRegisterType(ttype, &ntype);
index de41c72..f568058 100644 (file)
@@ -49,7 +49,6 @@ void register_node_type_cmp_flip(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_FLIP, "Flip", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_flip_in, cmp_node_flip_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 8a9966a..6da5616 100644 (file)
@@ -51,7 +51,6 @@ void register_node_type_cmp_gamma(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_gamma_in, cmp_node_gamma_out);
-       node_type_size(&ntype, 140, 100, 320);
        
        nodeRegisterType(ttype, &ntype);
 }
index 5fdb262..dde056d 100644 (file)
@@ -63,7 +63,6 @@ void register_node_type_cmp_glare(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_GLARE, "Glare", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_glare_in, cmp_node_glare_out);
-       node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_glare);
        node_type_storage(&ntype, "NodeGlare", node_free_standard_storage, node_copy_standard_storage);
 
index be74819..64ba24e 100644 (file)
@@ -59,7 +59,6 @@ void register_node_type_cmp_hue_sat(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_HUE_SAT, "Hue Saturation Value", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_hue_sat_in, cmp_node_hue_sat_out);
-       node_type_size(&ntype, 150, 80, 250);
        node_type_init(&ntype, node_composit_init_hue_sat);
        node_type_storage(&ntype, "NodeHueSat", node_free_standard_storage, node_copy_standard_storage);
 
index 45002b0..738f2f5 100644 (file)
@@ -65,7 +65,7 @@ void register_node_type_cmp_huecorrect(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_HUECORRECT, "Hue Correct", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_huecorrect_in, cmp_node_huecorrect_out);
-       node_type_size(&ntype, 320, 140, 400);
+       node_type_size(&ntype, 320, 140, 500);
        node_type_init(&ntype, node_composit_init_huecorrect);
        node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 
index 8aa0838..89ef4ad 100644 (file)
@@ -50,7 +50,6 @@ void register_node_type_cmp_idmask(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_ID_MASK, "ID Mask", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_idmask_in, cmp_node_idmask_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 66a141b..563ad2b 100644 (file)
@@ -324,7 +324,6 @@ void register_node_type_cmp_image(bNodeTreeType *ttype)
        static bNodeType ntype;
 
        node_type_base(ttype, &ntype, CMP_NODE_IMAGE, "Image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
-       node_type_size(&ntype, 120, 80, 300);
        node_type_init(&ntype, node_composit_init_image);
        node_type_storage(&ntype, "ImageUser", node_composit_free_image, node_composit_copy_image);
        node_type_update(&ntype, cmp_node_image_update, NULL);
@@ -341,7 +340,6 @@ void register_node_type_cmp_rlayers(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_rlayers_out);
-       node_type_size(&ntype, 150, 100, 300);
 
        nodeRegisterType(ttype, &ntype);
 }
index 95e5834..4844b35 100644 (file)
@@ -50,7 +50,6 @@ void register_node_type_cmp_inpaint(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_INPAINT, "Inpaint", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_inpaint_in, cmp_node_inpaint_out);
-       node_type_size(&ntype, 130, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 05bccf8..0bfbe42 100644 (file)
@@ -55,7 +55,6 @@ void register_node_type_cmp_invert(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_INVERT, "Invert", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_invert_in, cmp_node_invert_out);
-       node_type_size(&ntype, 120, 120, 140);
        node_type_init(&ntype, node_composit_init_invert);
 
        nodeRegisterType(ttype, &ntype);
index 5e28509..51e0e9a 100644 (file)
@@ -84,7 +84,6 @@ void register_node_type_cmp_keying(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_KEYING, "Keying", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_keying_in, cmp_node_keying_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_keying);
        node_type_storage(&ntype, "NodeKeyingData", node_free_standard_storage, node_copy_standard_storage);
 
index 5db7f8f..1974087 100644 (file)
@@ -65,7 +65,6 @@ void register_node_type_cmp_keyingscreen(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_KEYINGSCREEN, "Keying Screen", NODE_CLASS_MATTE, NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_keyingscreen_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_keyingscreen);
        node_type_storage(&ntype, "NodeKeyingScreenData", node_free_standard_storage, node_copy_standard_storage);
 
index e454022..15d10e0 100644 (file)
@@ -57,7 +57,6 @@ void register_node_type_cmp_lensdist(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_LENSDIST, "Lens Distortion", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_lensdist_in, cmp_node_lensdist_out);
-       node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_lensdist);
        node_type_storage(&ntype, "NodeLensDist", node_free_standard_storage, node_copy_standard_storage);
 
index 5f9797d..f50a883 100644 (file)
@@ -56,7 +56,6 @@ void register_node_type_cmp_view_levels(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW);
        node_type_socket_templates(&ntype, cmp_node_view_levels_in, cmp_node_view_levels_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_view_levels);
        node_type_storage(&ntype, "ImageUser", NULL, NULL);
 
index 6e0c877..60a7f30 100644 (file)
@@ -59,7 +59,6 @@ void register_node_type_cmp_luma_matte(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_LUMA_MATTE, "Luminance Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_luma_matte_in, cmp_node_luma_matte_out);
-       node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_luma_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
index f96e133..07f34e7 100644 (file)
@@ -52,7 +52,6 @@ void register_node_type_cmp_map_range(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MAP_RANGE, "Map Range", NODE_CLASS_OP_VECTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_map_range_in, cmp_node_map_range_out);
-       node_type_size(&ntype, 120, 60, 150);
 
        nodeRegisterType(ttype, &ntype);
 }
index 8fd49cd..fa4c8d7 100644 (file)
@@ -50,7 +50,6 @@ void register_node_type_cmp_mapuv(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MAP_UV, "Map UV", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_mapuv_in, cmp_node_mapuv_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 62db0be..046eeaf 100644 (file)
@@ -53,7 +53,6 @@ void register_node_type_cmp_map_value(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MAP_VALUE, "Map Value", NODE_CLASS_OP_VECTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_map_value_in, cmp_node_map_value_out);
-       node_type_size(&ntype, 100, 60, 150);
        node_type_init(&ntype, node_composit_init_map_value);
        node_type_storage(&ntype, "TexMapping", node_free_standard_storage, node_copy_standard_storage);
 
index 8be6ecd..2753469 100644 (file)
@@ -61,7 +61,6 @@ void register_node_type_cmp_mask(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MASK, "Mask", NODE_CLASS_INPUT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_mask_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_mask);
 
        node_type_storage(&ntype, "NodeMask", node_free_standard_storage, node_copy_standard_storage);
index 5bf555c..5f5369c 100644 (file)
@@ -51,7 +51,6 @@ void register_node_type_cmp_math(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MATH, "Math", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_math_in, cmp_node_math_out);
-       node_type_size(&ntype, 120, 110, 160);
        node_type_label(&ntype, node_math_label);
 
        nodeRegisterType(ttype, &ntype);
index fed73e1..23e4fc9 100644 (file)
@@ -50,7 +50,6 @@ void register_node_type_cmp_mix_rgb(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_mix_rgb_in, cmp_node_mix_rgb_out);
-       node_type_size(&ntype, 110, 60, 120);
        node_type_label(&ntype, node_blend_label);
 
        nodeRegisterType(ttype, &ntype);
index 85745d2..39d46e0 100644 (file)
@@ -56,7 +56,6 @@ void register_node_type_cmp_movieclip(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_movieclip_out);
-       node_type_size(&ntype, 120, 80, 300);
        node_type_init(&ntype, init);
        node_type_storage(&ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);
 
index 4817c59..198ffbb 100644 (file)
@@ -72,7 +72,6 @@ void register_node_type_cmp_moviedistortion(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_MOVIEDISTORTION, "Movie Distortion", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_moviedistortion_in, cmp_node_moviedistortion_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_label(&ntype, label);
 
        node_type_storage(&ntype, NULL, storage_free, storage_copy);
index 1497757..88db5d3 100644 (file)
@@ -62,7 +62,6 @@ void register_node_type_cmp_normal(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_NORMAL, "Normal", NODE_CLASS_OP_VECTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_normal_in, cmp_node_normal_out);
        node_type_init(&ntype, init);
-       node_type_size(&ntype, 100, 60, 200);
 
        nodeRegisterType(ttype, &ntype);
 }
index f90a5cd..db81166 100644 (file)
@@ -49,7 +49,6 @@ void register_node_type_cmp_normalize(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_NORMALIZE, "Normalize", NODE_CLASS_OP_VECTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_normalize_in, cmp_node_normalize_out);
-       node_type_size(&ntype, 100, 60, 150);
        
        nodeRegisterType(ttype, &ntype);
 }
index e8a6506..dff09b9 100644 (file)
@@ -231,7 +231,6 @@ void register_node_type_cmp_output_file(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW);
        node_type_socket_templates(&ntype, NULL, NULL);
-       node_type_size(&ntype, 140, 80, 300);
        node_type_init(&ntype, init_output_file);
        node_type_storage(&ntype, "NodeImageMultiFile", free_output_file, copy_output_file);
        node_type_update(&ntype, update_output_file, NULL);
index 5eac486..3b65a2c 100644 (file)
@@ -51,7 +51,6 @@ void register_node_type_cmp_pixelate(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_PIXELATE, "Pixelate", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_pixelate_in, cmp_node_pixelate_out);
-       node_type_size(&ntype, 130, 100, 130);
 
        nodeRegisterType(ttype, &ntype);
 }
index 88f583b..01eb360 100644 (file)
@@ -50,7 +50,6 @@ void register_node_type_cmp_premulkey(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_PREMULKEY, "Alpha Convert", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_premulkey_in, cmp_node_premulkey_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index ad06d7a..30b23a4 100644 (file)
@@ -57,7 +57,7 @@ void register_node_type_cmp_rgb(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_RGB, "RGB", NODE_CLASS_INPUT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_rgb_out);
        node_type_init(&ntype, node_composit_init_rgb);
-       node_type_size(&ntype, 140, 80, 140);
+       node_type_size_preset(&ntype, NODE_SIZE_SMALL);
 
        nodeRegisterType(ttype, &ntype);
 }
index 4eb869e..6b5521e 100644 (file)
@@ -55,7 +55,6 @@ void register_node_type_cmp_rotate(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_ROTATE, "Rotate", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_rotate_in, cmp_node_rotate_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_rotate);
 
        nodeRegisterType(ttype, &ntype);
index 5136aec..6c2c6c3 100644 (file)
@@ -51,7 +51,6 @@ void register_node_type_cmp_scale(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SCALE, "Scale", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_scale_in, cmp_node_scale_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 83b9d5d..d463f35 100644 (file)
@@ -52,7 +52,6 @@ void register_node_type_cmp_sephsva(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SEPHSVA, "Separate HSVA", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_sephsva_in, cmp_node_sephsva_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -77,7 +76,6 @@ void register_node_type_cmp_combhsva(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COMBHSVA, "Combine HSVA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combhsva_in, cmp_node_combhsva_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
index 8508087..03b43f5 100644 (file)
@@ -51,7 +51,6 @@ void register_node_type_cmp_seprgba(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SEPRGBA, "Separate RGBA", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_seprgba_in, cmp_node_seprgba_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -77,7 +76,6 @@ void register_node_type_cmp_combrgba(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COMBRGBA, "Combine RGBA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combrgba_in, cmp_node_combrgba_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
index a7cc736..16aba1b 100644 (file)
@@ -53,7 +53,6 @@ void register_node_type_cmp_sepycca(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_sepycca_in, cmp_node_sepycca_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -79,7 +78,6 @@ void register_node_type_cmp_combycca(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combycca_in, cmp_node_combycca_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
index 88edf7e..7d7ec16 100644 (file)
@@ -53,7 +53,6 @@ void register_node_type_cmp_sepyuva(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SEPYUVA, "Separate YUVA", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_sepyuva_in, cmp_node_sepyuva_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
@@ -79,7 +78,6 @@ void register_node_type_cmp_combyuva(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_COMBYUVA, "Combine YUVA", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_combyuva_in, cmp_node_combyuva_out);
-       node_type_size(&ntype, 80, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
index 0cec19b..d36acc6 100644 (file)
@@ -49,7 +49,6 @@ void register_node_type_cmp_setalpha(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SETALPHA, "Set Alpha", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_setalpha_in, cmp_node_setalpha_out);
-       node_type_size(&ntype, 120, 40, 140);
 
        nodeRegisterType(ttype, &ntype);
 }
index 3f4c3d6..38a6981 100644 (file)
@@ -55,7 +55,6 @@ void register_node_type_cmp_splitviewer(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SPLITVIEWER, "Split Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_splitviewer_in, NULL);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_splitviewer);
        node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
 
index 964e54e..6b345b4 100644 (file)
@@ -51,7 +51,6 @@ void register_node_type_cmp_stabilize2d(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_STABILIZE2D, "Stabilize 2D", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_stabilize2d_in, cmp_node_stabilize2d_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 7f9127c..49fa61a 100644 (file)
@@ -52,7 +52,7 @@ void register_node_type_cmp_switch(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_SWITCH, "Switch", NODE_CLASS_LAYOUT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_switch_in, cmp_node_switch_out);
-       node_type_size(&ntype, 110, 60, 120);
+       node_type_size_preset(&ntype, NODE_SIZE_SMALL);
        nodeRegisterType(ttype, &ntype);
 }
 
index 17b5720..515093f 100644 (file)
@@ -50,7 +50,6 @@ void register_node_type_cmp_texture(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_OPTIONS|NODE_PREVIEW);
        node_type_socket_templates(&ntype, cmp_node_texture_in, cmp_node_texture_out);
-       node_type_size(&ntype, 120, 80, 240);
 
        nodeRegisterType(ttype, &ntype);
 }
index 9449243..fd3a217 100644 (file)
@@ -63,7 +63,6 @@ void register_node_type_cmp_tonemap(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_TONEMAP, "Tonemap", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_tonemap_in, cmp_node_tonemap_out);
-       node_type_size(&ntype, 150, 120, 200);
        node_type_init(&ntype, node_composit_init_tonemap);
        node_type_storage(&ntype, "NodeTonemap", node_free_standard_storage, node_copy_standard_storage);
 
index 41dc563..8014e87 100644 (file)
@@ -52,7 +52,6 @@ void register_node_type_cmp_trackpos(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_TRACKPOS, "Track Position", NODE_CLASS_INPUT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_trackpos_out);
-       node_type_size(&ntype, 120, 80, 300);
        node_type_init(&ntype, init);
        node_type_storage(&ntype, "NodeTrackPosData", node_free_standard_storage, node_copy_standard_storage);
 
index f51e493..3ed8bdb 100644 (file)
@@ -54,7 +54,6 @@ void register_node_type_cmp_transform(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_TRANSFORM, "Transform", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_transform_in, cmp_node_transform_out);
-       node_type_size(&ntype, 140, 100, 320);
 
        nodeRegisterType(ttype, &ntype);
 }
index 60b3256..5d555cd 100644 (file)
@@ -58,7 +58,6 @@ void register_node_type_cmp_translate(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_TRANSLATE, "Translate", NODE_CLASS_DISTORT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_translate_in, cmp_node_translate_out);
-       node_type_size(&ntype, 140, 100, 320);
        node_type_init(&ntype, node_composit_init_translate);
        node_type_storage(&ntype, "NodeTranslateData", node_free_standard_storage, node_copy_standard_storage);
 
index c40880c..5a23507 100644 (file)
@@ -55,7 +55,7 @@ void register_node_type_cmp_valtorgb(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_VALTORGB, "ColorRamp", NODE_CLASS_CONVERTOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_valtorgb_in, cmp_node_valtorgb_out);
-       node_type_size(&ntype, 240, 200, 300);
+       node_type_size(&ntype, 240, 200, 320);
        node_type_init(&ntype, node_composit_init_valtorgb);
        node_type_storage(&ntype, "ColorBand", node_free_standard_storage, node_copy_standard_storage);
 
@@ -80,7 +80,7 @@ void register_node_type_cmp_rgbtobw(bNodeTreeType *ttype)
        
        node_type_base(ttype, &ntype, CMP_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTOR, 0);
        node_type_socket_templates(&ntype, cmp_node_rgbtobw_in, cmp_node_rgbtobw_out);
-       node_type_size(&ntype, 80, 40, 120);
+       node_type_size_preset(&ntype, NODE_SIZE_SMALL);
        
        nodeRegisterType(ttype, &ntype);
 }
index 05e79ef..306170b 100644 (file)
@@ -56,7 +56,7 @@ void register_node_type_cmp_value(bNodeTreeType *ttype)
        node_type_base(ttype, &ntype, CMP_NODE_VALUE, "Value", NODE_CLASS_INPUT, NODE_OPTIONS);
        node_type_socket_templates(&ntype, NULL, cmp_node_value_out);
        node_type_init(&ntype, node_composit_init_value);
-       node_type_size(&ntype, 80, 40, 120);
+       node_type_size_preset(&ntype, NODE_SIZE_SMALL);
 
        nodeRegisterType(ttype, &ntype);
 }
index ff4fe8d..35fb4a9 100644 (file)
@@ -60,7 +60,6 @@ void register_node_type_cmp_vecblur(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_VECBLUR, "Vector Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_vecblur_in, cmp_node_vecblur_out);
-       node_type_size(&ntype, 120, 80, 200);
        node_type_init(&ntype, node_composit_init_vecblur);
        node_type_storage(&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
 
index 233a062..211ebe5 100644 (file)
@@ -58,7 +58,6 @@ void register_node_type_cmp_viewer(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_VIEWER, "Viewer", NODE_CLASS_OUTPUT, NODE_OPTIONS | NODE_PREVIEW);
        node_type_socket_templates(&ntype, cmp_node_viewer_in, NULL);
-       node_type_size(&ntype, 80, 60, 200);
        node_type_init(&ntype, node_composit_init_viewer);
        node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
 
index 89d0ccc..ba81174 100644 (file)
@@ -54,7 +54,6 @@ void register_node_type_cmp_zcombine(bNodeTreeType *ttype)
 
        node_type_base(ttype, &ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
        node_type_socket_templates(&ntype, cmp_node_zcombine_in, cmp_node_zcombine_out);
-       node_type_size(&ntype, 80, 40, 120);
 
        nodeRegisterType(ttype, &ntype);
 }