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 5024b3636c5b2453a6dbc02299fdd36faf65b402..19fe621ade9da129d0e53c49f026db9b21f75907 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 97bee320ecb654eb266ccdef5e6b34fb12de69d0..86fe47268d6897023453dd2f2d6764dd41f8e600 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 3722ad179d0210df99d821e0d99364ff528b6f41..217670621a862ad2212ba4778e22a8bb8f0e0847 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 34cc9a9061512ccf176ead245840ebb2f7e3d8ee..b8bf379b14b775ac9316e7165c7063abde1ac389 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 9d19f9667bc35039dfba519c4e69fcb9e70f2687..20fce05a40ec7f6e676b96d8ac7f26ea1a1b9c3d 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 222ac7a5cdffb40bc2dc0e41c18c410cdde981fc..ea3162a9e55c556719128410bf394492a39dbb54 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 fa21e122ebfc7f30883ccffcfb3aa2ba6c0b5bfb..b006280ca8aa60bd84405a4d413f27d5e0fd3596 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 d3c6b2ccef047e11a267aac9e5516c329166ef5a..eb2c58894f3d05ce1b6eb174bc78322e3f9a9506 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 719423edcf8d483a52f670c25598d8f268d6224e..025f5c03c7c92af82c634b7094bb141911440508 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 bfeeb7ddc997643096c8bd2b915a19e59fccb331..acb0566be7c5e8779e63a62443e191e456a28a2b 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 83c8bbc9a1edfd51a223e6dea5165d69abe3fabe..29782c3bc5156fa7c19d26b1a3f9ed674e1a33dc 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 1642d9283c35dbee89923f8e17dac46384ff01a5..9905a2446b831fdcbafb7642f4795cd12e2cfeb6 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 3679a65b238d37bc36b8dd4b35baca06befa2677..32fa446790e89e7cdff55b6c7c02392a2a8bcd69 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 526f8472992e77fb5f06012a517fdf1a1ddbbd86..19f2fad2e428f26f3d32be56592823693e27a8b3 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 6cff403976761dff8c62f76d7aba3046a98038b5..ea281a3f556bf91738ff8c1c91ab3fc75c158f69 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 90d48a543ad5346f9f3408fc93f45e9082d705f3..10af55480cdd7302efeb43a51bae19e74587eac7 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 88787cc869eb801176e75b112628b4a9ad945668..c05f1d6fcffde692f0b691768caf111af5fc3b25 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 8fc97ef6a86395829cc6994057bfd51f8129bf39..816a1803e47f29d302eddc76e1d7ce878b7c4c77 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 bcfd9dd768b945d86dd59cc7b61e51261a451e85..29712d54e32c71ec8d904858741e429b099a6bdb 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 0238914a9d1061194784a31b2d75f24726e7ed46..fabc54f61b3eb4cee75613eea158e3dc19e7f81c 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 ca32f37a32e42374b8be1ae0ab46bc3b423430e9..6197d78563c6683431ff5762b400f91d2d81b625 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 595596765a9d692d5ddfaae27d0902ba912b5afb..251345d8a2851a66a50decf86bf07987f7ab295c 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 fffb85cca8e24f92a9223f39114df6d428ed08cb..26f8055e7f27f0c7a8761ec2ddcc5fb0762e28cb 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 4f42c40ee13b9c4400c614dd565f11a9a30a14c8..d5dd63a4042a775a148c92093901ff4ef8702156 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 761b0b13f114c6f7fbfcbf12065941fdc2d3146e..c2e34dc07a0bbcc9569e257f065d4560699b544e 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 338bfc0326d76342a6ae5e542a2515027c6877eb..3ecc7282632e9165c03299580edb1abf7f687187 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 de41c7274fec3abb91edda4fe5ed2290896b6bb1..f56805809c51cf65748844c3640802a01a506804 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 8a9966a2420c5149325167708756fba397dcfb81..6da56165979772d9e5e08bbc73215f54448934a5 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 5fdb262de97a073f34bbb4204915444e752c2e40..dde056de8076642793bf9c46dc58d165bb14778b 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 be748199bc527eeca6b967cea8963767a5a4e8aa..64ba24e082d0e434fade319dcfba51175ed29d53 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 45002b0aa0bd9de4e4e853773cacc848ecc17f49..738f2f511f7744fa4351edc0271392578e5e506e 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 8aa08386ae9d59ea4852be91c6f5846a6aa2b709..89ef4ad3d01d645309a10c6d9ff2f6a1b575e7e7 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 66a141b8b6ea02cfb27aa099a02bec84ff105026..563ad2b74b2a75b1adcab3a9ee254607c0baf2ce 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 95e5834456ceb24e6ec6e592db23dcb24c3956fd..4844b35fb6255a7b8998afe5e1e0c9b44bfcba5f 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 05bccf84d589fac51fe2719d521d9c0eeafb7112..0bfbe42868b16c30738b22d4f0ca8bda4d82aeeb 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 5e285095a4edc5d6f65602b9d7705a2d6f1bf233..51e0e9a8e39c13dae6044f84e5df355e2de4df55 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 5db7f8fc991287e08324bde251e419cb99cbe8e9..1974087e8e7a19fe1f5a404c109445fc71714fc6 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 e454022de3d3c24f3df0875142ce25e154eb3041..15d10e0794682d4892290ac7ab9e31277fb9800e 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 5f9797d9123043636234dab20c04dba275210822..f50a8838d741668d73d54ada68f07b06ddec9485 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 6e0c877fe1cbceeb93f822547387f0a435419237..60a7f3014dee9898290f8dd234858135fab3c8d0 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 f96e133b19fb71c061ba5e66e0f3cf93b3a0ef56..07f34e79bd139872502640604d8dc5bb1d95ee8b 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 8fd49cd206bf5ad3e5cc7ab03631570ed2a01120..fa4c8d7022c746117dbf9b1c7cc42a7104b2b9f2 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 62db0be541198e1550375d61e47a1d00fbec3b3f..046eeaf4fc8a58c5de760c8be291f908cbd7e322 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 8be6ecd27fd92f77ce3360df9a47b46da8b52093..27534698422ef91a2b0280b3f29781b750457f99 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 5bf555cd60594bec82a63ffe4164142a33c4f945..5f5369ce03aaa10a358dceba01366c413636e523 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 fed73e13c92e861b3bd7a462690e180b43f0cad3..23e4fc9045763aab09e0cc6797f3a6d56eaf97c3 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 85745d2ff4073fb7e58514842969d22cb508d1c0..39d46e053bff9b460fe76e9e18cb620029575f1d 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 4817c59bbbd742f0d27ba7bfe515a37b3f8d9167..198ffbb2857c6d3d825b2b4aacc39d03aeddf523 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 1497757bbf4bc3c75f4193bcbf747f76357a5747..88db5d36810de548bdafe3d5e49c0a3ee85d71a9 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 f90a5cdba74817e2c60747675526806cbde12227..db811666900368f3484620a87ebcf7522a499a5d 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 e8a650682c2199049966824a2307d810a411d7cf..dff09b93845c9c5a5ab2843c94dddcbe1261cef4 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 5eac4867a232cb93c2a34a1e381c67df3de2f548..3b65a2cdbd5d328ef9b838eabec052331291b329 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 88f583b402e4b342794a236d0c38c0d4c0e5f812..01eb360776081283e99d50b7b7380ca6677b0fe2 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 ad06d7a9a7e2455153e57c886368068e2c372ea4..30b23a4c14668fa853bb2de4c025d9e3cbe3b047 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 4eb869e544459a8a49d950afba1918021c5179ca..6b5521ea4d269a99491167523368a0072ad001bd 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 5136aec112d4123002373fbbe74ad097cc756443..6c2c6c37cb79c9702dc7cb75188b7dd6482a41a7 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 83b9d5d3fcd696a1d062d44bdacf9edeb84542cf..d463f35a07ac2fcd9ba4a5a6e95de8ccf3ddc644 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 8508087da0fb7493d004cceb0ab0f80f54627aa2..03b43f5073fb72d56b70c2f7534e2fb549332b62 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 a7cc7367c672d3684e339a56bfee8f925515960c..16aba1ba408b48922107f50b2ff03393ab6637a1 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 88edf7ec6b0cbf56cf94424ba1e352e809f91108..7d7ec166fd4cb56266ea2dbbde32082149954bc8 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 0cec19b15afa2c44b49b93ccb5fc0b3cdc2b7650..d36acc6c054f3f2238a274cc40bc35b82e00bbba 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 3f4c3d67e2cd25ffd95aff6da64e476ea37f2936..38a6981613ad743e3fcca531a9e463853311d549 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 964e54eb86251b26b96bb9b8927d9fd963116acf..6b345b4c15c00bb201f26a1ef56c21a914fcd3ce 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 7f9127c969f9408383c17c8c48918ae3fdd5b04c..49fa61a8397bd20d9c36492f099438a6ffdb1a76 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 17b5720c7adfa85fa42766891d691d46d91bbeb2..515093fc3e1fecaeb3ebd39c5383b170c323f722 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 94492431c9f6b064d6c5908065ee53f1babdce51..fd3a217b150573d2c5d99fc15b27b8d160363893 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 41dc5633ee550605291cf15e5c0890aa4ed0bf75..8014e8798941defb77129d698ac2df63aaad35a2 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 f51e49328abe2152b92a6b8ac4b2fe1bce4c0b5f..3ed8bdb99951366fb3718e755a46870939b79a83 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 60b3256356971a780dba7a1cf7bb6f2de19b16d6..5d555cdcda9a6d8a1bd37157975fe25d8cc0a7be 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 c40880cc421a49f88b5c3a401ff16b48ad2b345e..5a23507bcc7f07d00d4b08897eb648312f0abf9a 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 05e79efa196524233c3a32a986d915e70baf2fe3..306170baf93cd0cb5c9ae86af45d78d18bd23b5b 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 ff4fe8d8da54423828782eca420d1dbeee7d87a3..35fb4a944db23576e444f3af315ce1d99c33fcef 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 233a0627a7a83244379527a9914c144492d0433e..211ebe54eb0e621ddcd36518120c209619e7f2f7 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 89d0cccd1832e4adf69e560e81545e17393a0210..ba81174e10301e0f31fbba2e9a95548a51a23717 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);
 }