Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-03-18 22:25:05 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-18 22:25:05 +0400
commit01e9dae3dc6c7de00e441a8b505debc6df830520 (patch)
tree917d578202f35f095c98506567a62c8240c803e6 /source/blender/nodes/texture
parent57f69f2f180a988f274d979b1e5f2ad17e9cb77a (diff)
code cleanup
Diffstat (limited to 'source/blender/nodes/texture')
-rw-r--r--source/blender/nodes/texture/node_texture_tree.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_at.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_bricks.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_checker.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_common.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_compose.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_coord.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_curves.c4
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_decompose.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_distance.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_hueSatVal.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_image.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_invert.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_math.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_mixRgb.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_output.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_proc.c4
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_rotate.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_scale.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_texture.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_translate.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_valToNor.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_valToRgb.c6
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_viewer.c2
24 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index 0690ccdd19f..e1a29a67446 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -154,7 +154,7 @@ static void update(bNodeTree *ntree)
bNodeTreeType *ntreeType_Texture;
-void register_node_tree_type_tex()
+void register_node_tree_type_tex(void)
{
bNodeTreeType *tt = ntreeType_Texture = MEM_callocN(sizeof(bNodeTreeType), "texture node tree type");
diff --git a/source/blender/nodes/texture/nodes/node_texture_at.c b/source/blender/nodes/texture/nodes/node_texture_at.c
index ef930a39fe3..aafb9793d2c 100644
--- a/source/blender/nodes/texture/nodes/node_texture_at.c
+++ b/source/blender/nodes/texture/nodes/node_texture_at.c
@@ -58,7 +58,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_at()
+void register_node_type_tex_at(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index afcbf4216c3..15cde299f35 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -121,7 +121,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_bricks()
+void register_node_type_tex_bricks(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_checker.c b/source/blender/nodes/texture/nodes/node_texture_checker.c
index 53c91db0312..77c6a2e3010 100644
--- a/source/blender/nodes/texture/nodes/node_texture_checker.c
+++ b/source/blender/nodes/texture/nodes/node_texture_checker.c
@@ -70,7 +70,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_checker()
+void register_node_type_tex_checker(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c
index 2af2a3a1999..e884d50dc05 100644
--- a/source/blender/nodes/texture/nodes/node_texture_common.c
+++ b/source/blender/nodes/texture/nodes/node_texture_common.c
@@ -149,7 +149,7 @@ static void group_execute(void *data, int thread, struct bNode *node, bNodeExecD
ntreeReleaseThreadStack(nts);
}
-void register_node_type_tex_group()
+void register_node_type_tex_group(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_compose.c b/source/blender/nodes/texture/nodes/node_texture_compose.c
index ddaae829da9..065d16a5784 100644
--- a/source/blender/nodes/texture/nodes/node_texture_compose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_compose.c
@@ -57,7 +57,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_compose()
+void register_node_type_tex_compose(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_coord.c b/source/blender/nodes/texture/nodes/node_texture_coord.c
index 94793288ec3..b313e1f67ac 100644
--- a/source/blender/nodes/texture/nodes/node_texture_coord.c
+++ b/source/blender/nodes/texture/nodes/node_texture_coord.c
@@ -48,7 +48,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &vectorfn, data);
}
-void register_node_type_tex_coord()
+void register_node_type_tex_coord(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_curves.c b/source/blender/nodes/texture/nodes/node_texture_curves.c
index 94235eae93c..1778eeaeffa 100644
--- a/source/blender/nodes/texture/nodes/node_texture_curves.c
+++ b/source/blender/nodes/texture/nodes/node_texture_curves.c
@@ -67,7 +67,7 @@ static void time_init(bNodeTree *UNUSED(ntree), bNode *node)
node->storage= curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
}
-void register_node_type_tex_curve_time()
+void register_node_type_tex_curve_time(void)
{
static bNodeType ntype;
@@ -111,7 +111,7 @@ static void rgb_init(bNodeTree *UNUSED(ntree), bNode *node)
node->storage= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
}
-void register_node_type_tex_curve_rgb()
+void register_node_type_tex_curve_rgb(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_decompose.c b/source/blender/nodes/texture/nodes/node_texture_decompose.c
index fa2c1d6398f..1207377d150 100644
--- a/source/blender/nodes/texture/nodes/node_texture_decompose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_decompose.c
@@ -78,7 +78,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[3], &valuefn_a, data);
}
-void register_node_type_tex_decompose()
+void register_node_type_tex_decompose(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_distance.c b/source/blender/nodes/texture/nodes/node_texture_distance.c
index fefa093481d..f47f9260337 100644
--- a/source/blender/nodes/texture/nodes/node_texture_distance.c
+++ b/source/blender/nodes/texture/nodes/node_texture_distance.c
@@ -61,7 +61,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &valuefn, data);
}
-void register_node_type_tex_distance()
+void register_node_type_tex_distance(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
index c5acf01801c..56da4ad24c0 100644
--- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
+++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
@@ -92,7 +92,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_hue_sat()
+void register_node_type_tex_hue_sat(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index e897b0e4e96..57fa562ac0b 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -97,7 +97,7 @@ static void init(bNodeTree *UNUSED(ntree), bNode *node)
iuser->ok= 1;
}
-void register_node_type_tex_image()
+void register_node_type_tex_image(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_invert.c b/source/blender/nodes/texture/nodes/node_texture_invert.c
index aa394bff8bc..fd6e2144e0e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_invert.c
+++ b/source/blender/nodes/texture/nodes/node_texture_invert.c
@@ -63,7 +63,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_invert()
+void register_node_type_tex_invert(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index e83579070a9..499412e750d 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -186,7 +186,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &valuefn, data);
}
-void register_node_type_tex_math()
+void register_node_type_tex_math(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
index 7a68af4b1e2..12ac27f26b7 100644
--- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
@@ -64,7 +64,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_mix_rgb()
+void register_node_type_tex_mix_rgb(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index 8c8f7622d29..f4086ed1eec 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -158,7 +158,7 @@ static void copy(bNodeTree *dest_ntree, bNode *dest_node, bNode *src_node)
assign_index(dest_node);
}
-void register_node_type_tex_output()
+void register_node_type_tex_output(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c
index 504e77ebb27..f7e7a585ae2 100644
--- a/source/blender/nodes/texture/nodes/node_texture_proc.c
+++ b/source/blender/nodes/texture/nodes/node_texture_proc.c
@@ -296,11 +296,11 @@ static void init(bNodeTree *UNUSED(ntree), bNode *node)
/* Node type definitions */
#define TexDef(TEXTYPE, outputs, name, Name) \
-void register_node_type_tex_proc_##name() \
+void register_node_type_tex_proc_##name(void) \
{ \
static bNodeType ntype; \
\
- tex_node_type_base(&ntype, TEX_NODE_PROC+TEXTYPE, Name, NODE_CLASS_TEXTURE, NODE_PREVIEW|NODE_OPTIONS); \
+ tex_node_type_base(&ntype, TEX_NODE_PROC+TEXTYPE, Name, NODE_CLASS_TEXTURE, NODE_PREVIEW | NODE_OPTIONS); \
node_type_socket_templates(&ntype, name##_inputs, outputs); \
node_type_size(&ntype, 140, 80, 140); \
node_type_init(&ntype, init); \
diff --git a/source/blender/nodes/texture/nodes/node_texture_rotate.c b/source/blender/nodes/texture/nodes/node_texture_rotate.c
index 8f3f66dbee4..02a5a9e1a97 100644
--- a/source/blender/nodes/texture/nodes/node_texture_rotate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_rotate.c
@@ -95,7 +95,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_rotate()
+void register_node_type_tex_rotate(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_scale.c b/source/blender/nodes/texture/nodes/node_texture_scale.c
index 67e0c064b7c..8eabdabc713 100644
--- a/source/blender/nodes/texture/nodes/node_texture_scale.c
+++ b/source/blender/nodes/texture/nodes/node_texture_scale.c
@@ -68,7 +68,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_scale()
+void register_node_type_tex_scale(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c
index 9970c3c2a26..a42633cb2b4 100644
--- a/source/blender/nodes/texture/nodes/node_texture_texture.c
+++ b/source/blender/nodes/texture/nodes/node_texture_texture.c
@@ -95,7 +95,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_texture()
+void register_node_type_tex_texture(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_translate.c b/source/blender/nodes/texture/nodes/node_texture_translate.c
index 3d5db4f863a..55782fbecac 100644
--- a/source/blender/nodes/texture/nodes/node_texture_translate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_translate.c
@@ -64,7 +64,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &colorfn, data);
}
-void register_node_type_tex_translate()
+void register_node_type_tex_translate(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToNor.c b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
index d7495f9833d..6be61c914db 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToNor.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
@@ -80,7 +80,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
tex_output(node, execdata, in, out[0], &normalfn, data);
}
-void register_node_type_tex_valtonor()
+void register_node_type_tex_valtonor(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
index fec89aa03eb..871cdab384e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
@@ -59,10 +59,10 @@ static void valtorgb_exec(void *data, int UNUSED(thread), bNode *node, bNodeExec
static void valtorgb_init(bNodeTree *UNUSED(ntree), bNode *node)
{
- node->storage = add_colorband(1);
+ node->storage = add_colorband(true);
}
-void register_node_type_tex_valtorgb()
+void register_node_type_tex_valtorgb(void)
{
static bNodeType ntype;
@@ -99,7 +99,7 @@ static void rgbtobw_exec(void *data, int UNUSED(thread), bNode *node, bNodeExecD
tex_output(node, execdata, in, out[0], &rgbtobw_valuefn, data);
}
-void register_node_type_tex_rgbtobw()
+void register_node_type_tex_rgbtobw(void)
{
static bNodeType ntype;
diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.c b/source/blender/nodes/texture/nodes/node_texture_viewer.c
index 44724c9280f..4f7d54ab833 100644
--- a/source/blender/nodes/texture/nodes/node_texture_viewer.c
+++ b/source/blender/nodes/texture/nodes/node_texture_viewer.c
@@ -56,7 +56,7 @@ static void exec(void *data, int UNUSED(thread), bNode *UNUSED(node), bNodeExecD
}
}
-void register_node_type_tex_viewer()
+void register_node_type_tex_viewer(void)
{
static bNodeType ntype;