[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42013] trunk/blender/source/blender: Muting node patch: first part
Bastien Montagne
montagne29 at wanadoo.fr
Sun Nov 20 17:13:29 CET 2011
Revision: 42013
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42013
Author: mont29
Date: 2011-11-20 16:13:27 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Muting node patch: first part
This allows node type init code to have access to the nodetree type object (needed to allow generic muting node initialization). Huge and boring edits...
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/nodes/NOD_composite.h
trunk/blender/source/blender/nodes/NOD_shader.h
trunk/blender/source/blender/nodes/NOD_texture.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_flip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lensdist.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_movieclip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_setalpha.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_translate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_value.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_dynamic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_emission.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_fresnel.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_holdout.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_light_path.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_world.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_at.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_rotate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_scale.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_translate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToNor.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_viewer.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2011-11-20 16:08:56 UTC (rev 42012)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2011-11-20 16:13:27 UTC (rev 42013)
@@ -325,7 +325,7 @@
void nodeUnlinkNode(struct bNodeTree *ntree, struct bNode *node);
void nodeUniqueName(struct bNodeTree *ntree, struct bNode *node);
-void nodeRegisterType(struct ListBase *typelist, struct bNodeType *ntype) ;
+void nodeRegisterType(struct bNodeTreeType *ttype, struct bNodeType *ntype) ;
void nodeMakeDynamicType(struct bNode *node);
int nodeDynamicUnlinkText(struct ID *txtid);
@@ -368,7 +368,8 @@
void nodeGroupEditClear(struct bNode *node);
/* Init a new node type struct with default values and callbacks */
-void node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
+void node_type_base(struct bNodeTreeType *ttype, struct bNodeType *ntype, int type,
+ 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_init(struct bNodeType *ntype, void (*initfunc)(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp));
@@ -421,7 +422,7 @@
int node_group_ungroup(struct bNodeTree *ntree, struct bNode *gnode);
/* in node_common.c */
-void register_node_type_frame(ListBase *lb);
+void register_node_type_frame(struct bNodeTreeType *ttype);
/* ************** SHADER NODES *************** */
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-11-20 16:08:56 UTC (rev 42012)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-11-20 16:13:27 UTC (rev 42013)
@@ -1643,7 +1643,7 @@
}
}
-void node_type_base(bNodeType *ntype, int type, const char *name, short nclass, short flag)
+void node_type_base(bNodeTreeType *ttype, bNodeType *ntype, int type, const char *name, short nclass, short flag)
{
memset(ntype, 0, sizeof(bNodeType));
@@ -1772,211 +1772,212 @@
return NULL;
}
-void nodeRegisterType(ListBase *typelist, bNodeType *ntype)
+void nodeRegisterType(bNodeTreeType *ttype, bNodeType *ntype)
{
+ ListBase *typelist = &(ttype->node_types);
bNodeType *found= is_nodetype_registered(typelist, ntype->type);
if(found==NULL)
BLI_addtail(typelist, ntype);
}
-static void registerCompositNodes(ListBase *ntypelist)
+static void registerCompositNodes(bNodeTreeType *ttype)
{
- register_node_type_frame(ntypelist);
+ register_node_type_frame(ttype);
- register_node_type_cmp_group(ntypelist);
-// register_node_type_cmp_forloop(ntypelist);
-// register_node_type_cmp_whileloop(ntypelist);
+ register_node_type_cmp_group(ttype);
+// register_node_type_cmp_forloop(ttype);
+// register_node_type_cmp_whileloop(ttype);
- register_node_type_cmp_rlayers(ntypelist);
- register_node_type_cmp_image(ntypelist);
- register_node_type_cmp_texture(ntypelist);
- register_node_type_cmp_value(ntypelist);
- register_node_type_cmp_rgb(ntypelist);
- register_node_type_cmp_curve_time(ntypelist);
- register_node_type_cmp_movieclip(ntypelist);
+ register_node_type_cmp_rlayers(ttype);
+ register_node_type_cmp_image(ttype);
+ register_node_type_cmp_texture(ttype);
+ register_node_type_cmp_value(ttype);
+ register_node_type_cmp_rgb(ttype);
+ register_node_type_cmp_curve_time(ttype);
+ register_node_type_cmp_movieclip(ttype);
- register_node_type_cmp_composite(ntypelist);
- register_node_type_cmp_viewer(ntypelist);
- register_node_type_cmp_splitviewer(ntypelist);
- register_node_type_cmp_output_file(ntypelist);
- register_node_type_cmp_view_levels(ntypelist);
+ register_node_type_cmp_composite(ttype);
+ register_node_type_cmp_viewer(ttype);
+ register_node_type_cmp_splitviewer(ttype);
+ register_node_type_cmp_output_file(ttype);
+ register_node_type_cmp_view_levels(ttype);
- register_node_type_cmp_curve_rgb(ntypelist);
- register_node_type_cmp_mix_rgb(ntypelist);
- register_node_type_cmp_hue_sat(ntypelist);
- register_node_type_cmp_brightcontrast(ntypelist);
- register_node_type_cmp_gamma(ntypelist);
- register_node_type_cmp_invert(ntypelist);
- register_node_type_cmp_alphaover(ntypelist);
- register_node_type_cmp_zcombine(ntypelist);
- register_node_type_cmp_colorbalance(ntypelist);
- register_node_type_cmp_huecorrect(ntypelist);
+ register_node_type_cmp_curve_rgb(ttype);
+ register_node_type_cmp_mix_rgb(ttype);
+ register_node_type_cmp_hue_sat(ttype);
+ register_node_type_cmp_brightcontrast(ttype);
+ register_node_type_cmp_gamma(ttype);
+ register_node_type_cmp_invert(ttype);
+ register_node_type_cmp_alphaover(ttype);
+ register_node_type_cmp_zcombine(ttype);
+ register_node_type_cmp_colorbalance(ttype);
+ register_node_type_cmp_huecorrect(ttype);
- register_node_type_cmp_normal(ntypelist);
- register_node_type_cmp_curve_vec(ntypelist);
- register_node_type_cmp_map_value(ntypelist);
- register_node_type_cmp_normalize(ntypelist);
+ register_node_type_cmp_normal(ttype);
+ register_node_type_cmp_curve_vec(ttype);
+ register_node_type_cmp_map_value(ttype);
+ register_node_type_cmp_normalize(ttype);
- register_node_type_cmp_filter(ntypelist);
- register_node_type_cmp_blur(ntypelist);
- register_node_type_cmp_dblur(ntypelist);
- register_node_type_cmp_bilateralblur(ntypelist);
- register_node_type_cmp_vecblur(ntypelist);
- register_node_type_cmp_dilateerode(ntypelist);
- register_node_type_cmp_defocus(ntypelist);
+ register_node_type_cmp_filter(ttype);
+ register_node_type_cmp_blur(ttype);
+ register_node_type_cmp_dblur(ttype);
+ register_node_type_cmp_bilateralblur(ttype);
+ register_node_type_cmp_vecblur(ttype);
+ register_node_type_cmp_dilateerode(ttype);
+ register_node_type_cmp_defocus(ttype);
- register_node_type_cmp_valtorgb(ntypelist);
- register_node_type_cmp_rgbtobw(ntypelist);
- register_node_type_cmp_setalpha(ntypelist);
- register_node_type_cmp_idmask(ntypelist);
- register_node_type_cmp_math(ntypelist);
- register_node_type_cmp_seprgba(ntypelist);
- register_node_type_cmp_combrgba(ntypelist);
- register_node_type_cmp_sephsva(ntypelist);
- register_node_type_cmp_combhsva(ntypelist);
- register_node_type_cmp_sepyuva(ntypelist);
- register_node_type_cmp_combyuva(ntypelist);
- register_node_type_cmp_sepycca(ntypelist);
- register_node_type_cmp_combycca(ntypelist);
- register_node_type_cmp_premulkey(ntypelist);
+ register_node_type_cmp_valtorgb(ttype);
+ register_node_type_cmp_rgbtobw(ttype);
+ register_node_type_cmp_setalpha(ttype);
+ register_node_type_cmp_idmask(ttype);
+ register_node_type_cmp_math(ttype);
+ register_node_type_cmp_seprgba(ttype);
+ register_node_type_cmp_combrgba(ttype);
+ register_node_type_cmp_sephsva(ttype);
+ register_node_type_cmp_combhsva(ttype);
+ register_node_type_cmp_sepyuva(ttype);
+ register_node_type_cmp_combyuva(ttype);
+ register_node_type_cmp_sepycca(ttype);
+ register_node_type_cmp_combycca(ttype);
+ register_node_type_cmp_premulkey(ttype);
- register_node_type_cmp_diff_matte(ntypelist);
- register_node_type_cmp_distance_matte(ntypelist);
- register_node_type_cmp_chroma_matte(ntypelist);
- register_node_type_cmp_color_matte(ntypelist);
- register_node_type_cmp_channel_matte(ntypelist);
- register_node_type_cmp_color_spill(ntypelist);
- register_node_type_cmp_luma_matte(ntypelist);
+ register_node_type_cmp_diff_matte(ttype);
+ register_node_type_cmp_distance_matte(ttype);
+ register_node_type_cmp_chroma_matte(ttype);
+ register_node_type_cmp_color_matte(ttype);
+ register_node_type_cmp_channel_matte(ttype);
+ register_node_type_cmp_color_spill(ttype);
+ register_node_type_cmp_luma_matte(ttype);
- register_node_type_cmp_translate(ntypelist);
- register_node_type_cmp_rotate(ntypelist);
- register_node_type_cmp_scale(ntypelist);
- register_node_type_cmp_flip(ntypelist);
- register_node_type_cmp_crop(ntypelist);
- register_node_type_cmp_displace(ntypelist);
- register_node_type_cmp_mapuv(ntypelist);
- register_node_type_cmp_glare(ntypelist);
- register_node_type_cmp_tonemap(ntypelist);
- register_node_type_cmp_lensdist(ntypelist);
- register_node_type_cmp_transform(ntypelist);
- register_node_type_cmp_stabilize2d(ntypelist);
- register_node_type_cmp_moviedistortion(ntypelist);
+ register_node_type_cmp_translate(ttype);
+ register_node_type_cmp_rotate(ttype);
+ register_node_type_cmp_scale(ttype);
+ register_node_type_cmp_flip(ttype);
+ register_node_type_cmp_crop(ttype);
+ register_node_type_cmp_displace(ttype);
+ register_node_type_cmp_mapuv(ttype);
+ register_node_type_cmp_glare(ttype);
+ register_node_type_cmp_tonemap(ttype);
+ register_node_type_cmp_lensdist(ttype);
+ register_node_type_cmp_transform(ttype);
+ register_node_type_cmp_stabilize2d(ttype);
+ register_node_type_cmp_moviedistortion(ttype);
}
-static void registerShaderNodes(ListBase *ntypelist)
+static void registerShaderNodes(bNodeTreeType *ttype)
{
- register_node_type_frame(ntypelist);
+ register_node_type_frame(ttype);
- register_node_type_sh_group(ntypelist);
- //register_node_type_sh_forloop(ntypelist);
- //register_node_type_sh_whileloop(ntypelist);
+ register_node_type_sh_group(ttype);
+ //register_node_type_sh_forloop(ttype);
+ //register_node_type_sh_whileloop(ttype);
- register_node_type_sh_output(ntypelist);
- register_node_type_sh_material(ntypelist);
- register_node_type_sh_camera(ntypelist);
- register_node_type_sh_value(ntypelist);
- register_node_type_sh_rgb(ntypelist);
- register_node_type_sh_mix_rgb(ntypelist);
- register_node_type_sh_valtorgb(ntypelist);
- register_node_type_sh_rgbtobw(ntypelist);
- register_node_type_sh_texture(ntypelist);
- register_node_type_sh_normal(ntypelist);
- register_node_type_sh_geom(ntypelist);
- register_node_type_sh_mapping(ntypelist);
- register_node_type_sh_curve_vec(ntypelist);
- register_node_type_sh_curve_rgb(ntypelist);
- register_node_type_sh_math(ntypelist);
- register_node_type_sh_vect_math(ntypelist);
- register_node_type_sh_squeeze(ntypelist);
- //register_node_type_sh_dynamic(ntypelist);
- register_node_type_sh_material_ext(ntypelist);
- register_node_type_sh_invert(ntypelist);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list