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:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-09-20 16:01:16 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-09-20 16:01:16 +0400
commit7172316b945c62797e6beba953ff203766614531 (patch)
tree640ac56fadded9c7686399b5a1f1c64f1a135700 /source/blender/nodes/intern/node_common.c
parent2015eefef70350382931881dd65ed2da09f8f2cd (diff)
parent78d4260144dbf01166fac8bc9303e6d5aa022f71 (diff)
Merging r40366 through r40392 from trunk into soc-2011-garlicsoc-2011-garlic
Diffstat (limited to 'source/blender/nodes/intern/node_common.c')
-rw-r--r--source/blender/nodes/intern/node_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index d7830b6a260..35f2dbf7b32 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -826,11 +826,11 @@ bNodeTemplate node_forloop_template(bNode *node)
void node_forloop_init(bNodeTree *ntree, bNode *node, bNodeTemplate *ntemp)
{
- bNodeSocket *sock;
+ /* bNodeSocket *sock; */ /* UNUSED */
node->id = (ID*)ntemp->ngroup;
- sock = nodeAddInputFloat(ntree, node, "Iterations", PROP_UNSIGNED, 1, 0, 10000);
+ /* sock = */ nodeAddInputFloat(ntree, node, "Iterations", PROP_UNSIGNED, 1, 0, 10000);
/* NB: group socket input/output roles are inverted internally!
* Group "inputs" work as outputs in links and vice versa.
@@ -932,11 +932,11 @@ void node_loop_update_tree(bNodeTree *ngroup)
void node_whileloop_init(bNodeTree *ntree, bNode *node, bNodeTemplate *ntemp)
{
- bNodeSocket *sock;
+ /* bNodeSocket *sock; */ /* UNUSED */
node->id = (ID*)ntemp->ngroup;
- sock = nodeAddInputFloat(ntree, node, "Condition", PROP_NONE, 1, 0, 1);
+ /* sock = */ nodeAddInputFloat(ntree, node, "Condition", PROP_NONE, 1, 0, 1);
/* max iterations */
node->custom1 = 10000;