diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-27 11:31:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-27 11:31:10 +0300 |
commit | 2e5eb4152262adfc382860073dc5e73ced187e35 (patch) | |
tree | 3589c86b41a503b729c5a82462ad599a14fed4f3 /source/blender/nodes | |
parent | f73c993b16c4083f0c72b87ba3f70fa12a5077df (diff) |
pedantic warning cleanup, also remove texspace_edit() since its been added using a different method.
Diffstat (limited to 'source/blender/nodes')
9 files changed, 30 insertions, 30 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c index d028fede25f..aea2197d8de 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c @@ -170,7 +170,7 @@ static void node_composit_exec_chroma_matte(void *data, bNode *node, bNodeStack if(cbuf!=in[0]->data) free_compbuf(cbuf); -}; +} static void node_composit_init_chroma_matte(bNode *node) @@ -182,7 +182,7 @@ static void node_composit_init_chroma_matte(bNode *node) c->t3= 0.0f; c->fsize= 0.0f; c->fstrength= 1.0f; -}; +} void register_node_type_cmp_chroma_matte(ListBase *lb) { diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c index 5022c25819c..12092531edf 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c @@ -99,7 +99,7 @@ static void node_composit_exec_color_matte(void *data, bNode *node, bNodeStack * if(cbuf!=in[0]->data) free_compbuf(cbuf); -}; +} static void node_composit_init_color_matte(bNode *node) { @@ -110,7 +110,7 @@ static void node_composit_init_color_matte(bNode *node) c->t3= 0.1f; c->fsize= 0.0f; c->fstrength= 1.0f; -}; +} void register_node_type_cmp_color_matte(ListBase *lb) { diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_curves.c b/source/blender/nodes/intern/CMP_nodes/CMP_curves.c index 3c6fc72488f..2252693da32 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_curves.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_curves.c @@ -93,12 +93,12 @@ static void node_composit_exec_curve_vec(void *UNUSED(data), bNode *node, bNodeS /* stack order output: vec */ curvemapping_evaluate_premulRGBF(node->storage, out[0]->vec, in[0]->vec); -}; +} static void node_composit_init_curve_vec(bNode* node) { node->storage= curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f); -}; +} void register_node_type_cmp_curve_vec(ListBase *lb) { @@ -180,12 +180,12 @@ static void node_composit_exec_curve_rgb(void *UNUSED(data), bNode *node, bNodeS out[0]->data= stackbuf; } -}; +} static void node_composit_init_curve_rgb(bNode* node) { node->storage= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f); -}; +} void register_node_type_cmp_curve_rgb(ListBase *lb) { diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_image.c b/source/blender/nodes/intern/CMP_nodes/CMP_image.c index bb01f591512..dedba6919ab 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_image.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_image.c @@ -136,7 +136,7 @@ static CompBuf *node_composit_get_image(RenderData *rd, Image *ima, ImageUser *i } */ return stackbuf; -}; +} static CompBuf *node_composit_get_zimage(bNode *node, RenderData *rd) { @@ -153,7 +153,7 @@ static CompBuf *node_composit_get_zimage(bNode *node, RenderData *rd) } } return zbuf; -}; +} /* check if layer is available, returns pass buffer */ static CompBuf *compbuf_multilayer_get(RenderData *rd, RenderLayer *rl, Image *ima, ImageUser *iuser, int passtype) @@ -175,7 +175,7 @@ static CompBuf *compbuf_multilayer_get(RenderData *rd, RenderLayer *rl, Image *i return cbuf; } return NULL; -}; +} static void outputs_multilayer_get(RenderData *rd, RenderLayer *rl, bNodeStack **out, Image *ima, ImageUser *iuser) { @@ -212,7 +212,7 @@ static void outputs_multilayer_get(RenderData *rd, RenderLayer *rl, bNodeStack * out[RRES_OUT_EMIT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_EMIT); if(out[RRES_OUT_ENV]->hasoutput) out[RRES_OUT_ENV]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_ENVIRONMENT); -}; +} static void node_composit_exec_image(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out) @@ -285,7 +285,7 @@ static void node_composit_exec_image(void *data, bNode *node, bNodeStack **UNUSE generate_preview(data, node, stackbuf); } } -}; +} static void node_composit_init_image(bNode* node) { @@ -337,7 +337,7 @@ static CompBuf *compbuf_from_pass(RenderData *rd, RenderLayer *rl, int rectx, in return buf; } return NULL; -}; +} static void node_composit_rlayers_out(RenderData *rd, RenderLayer *rl, bNodeStack **out, int rectx, int recty) { @@ -374,7 +374,7 @@ static void node_composit_rlayers_out(RenderData *rd, RenderLayer *rl, bNodeStac out[RRES_OUT_EMIT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_EMIT); if(out[RRES_OUT_ENV]->hasoutput) out[RRES_OUT_ENV]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_ENVIRONMENT); -}; +} static void node_composit_exec_rlayers(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out) { @@ -423,7 +423,7 @@ static void node_composit_exec_rlayers(void *data, bNode *node, bNodeStack **UNU if(re) RE_ReleaseResult(re); -}; +} void register_node_type_cmp_rlayers(ListBase *lb) diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c index 42430ffeff8..6ab07828735 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c @@ -101,7 +101,7 @@ static void node_composit_init_luma_matte(bNode *node) node->storage=c; c->t1= 1.0f; c->t2= 0.0f; -}; +} void register_node_type_cmp_luma_matte(ListBase *lb) { diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_scale.c b/source/blender/nodes/intern/CMP_nodes/CMP_scale.c index 6f030d3d7b3..24d3ca17a0f 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_scale.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_scale.c @@ -107,7 +107,7 @@ static void node_composit_exec_scale(void *data, bNode *node, bNodeStack **in, b if(cbuf!=in[0]->data) free_compbuf(cbuf); } -}; +} void register_node_type_cmp_scale(ListBase *lb) { diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c b/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c index ff17a27d5e5..cae619b8dd4 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c @@ -88,7 +88,7 @@ static void node_composit_init_vecblur(bNode* node) node->storage= nbd; nbd->samples= 32; nbd->fac= 1.0f; -}; +} /* custom1: itterations, custom2: maxspeed (0 = nolimit) */ void register_node_type_cmp_vecblur(ListBase *lb) diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c index 28497b98197..93cdabc22ba 100644 --- a/source/blender/nodes/intern/CMP_util.c +++ b/source/blender/nodes/intern/CMP_util.c @@ -118,7 +118,7 @@ void free_compbuf(CompBuf *cbuf) void print_compbuf(char *str, CompBuf *cbuf) { - printf("Compbuf %s %d %d %p\n", str, cbuf->x, cbuf->y, cbuf->rect); + printf("Compbuf %s %d %d %p\n", str, cbuf->x, cbuf->y, (void *)cbuf->rect); } diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_proc.c b/source/blender/nodes/intern/TEX_nodes/TEX_proc.c index 084ce045203..79004f4e64c 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_proc.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_proc.c @@ -306,13 +306,13 @@ void register_node_type_tex_proc_##name(ListBase *lb) \ #define C outputs_color_only #define CV outputs_both -TexDef(TEX_VORONOI, CV, voronoi, "Voronoi" ); -TexDef(TEX_BLEND, C, blend, "Blend" ); -TexDef(TEX_MAGIC, C, magic, "Magic" ); -TexDef(TEX_MARBLE, CV, marble, "Marble" ); -TexDef(TEX_CLOUDS, CV, clouds, "Clouds" ); -TexDef(TEX_WOOD, CV, wood, "Wood" ); -TexDef(TEX_MUSGRAVE, CV, musgrave, "Musgrave" ); -TexDef(TEX_NOISE, C, noise, "Noise" ); -TexDef(TEX_STUCCI, CV, stucci, "Stucci" ); -TexDef(TEX_DISTNOISE, CV, distnoise, "Distorted Noise" ); +TexDef(TEX_VORONOI, CV, voronoi, "Voronoi" ) +TexDef(TEX_BLEND, C, blend, "Blend" ) +TexDef(TEX_MAGIC, C, magic, "Magic" ) +TexDef(TEX_MARBLE, CV, marble, "Marble" ) +TexDef(TEX_CLOUDS, CV, clouds, "Clouds" ) +TexDef(TEX_WOOD, CV, wood, "Wood" ) +TexDef(TEX_MUSGRAVE, CV, musgrave, "Musgrave" ) +TexDef(TEX_NOISE, C, noise, "Noise" ) +TexDef(TEX_STUCCI, CV, stucci, "Stucci" ) +TexDef(TEX_DISTNOISE, CV, distnoise, "Distorted Noise" ) |