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>2014-03-07 06:28:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-07 06:28:39 +0400
commit03af4cbf9173dd0440517dd0b9f8d464a4ec0350 (patch)
treece682c3014a529aabf622c4b1b091a6e19ad292b /source/blender/nodes
parent276ef3b3b5192aad5c3e5e02c69246818f89033b (diff)
Code cleanup: style
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/intern/node_util.c4
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_tex_wave.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c
index d3bde0a3b56..dcc58d38d31 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -196,8 +196,10 @@ static bNodeSocket *select_internal_link_input(bNode *node, bNodeSocket *output)
if (nodeSocketIsHidden(input) || /* ignore hidden sockets */
input->flag & SOCK_NO_INTERNAL_LINK || /* ignore if input is not allowed for internal connections */
priority < 0 || /* ignore incompatible types */
- priority < sel_priority) /* ignore if we already found a higher priority input */
+ priority < sel_priority) /* ignore if we already found a higher priority input */
+ {
continue;
+ }
/* determine if this input is preferred over the currently selected */
preferred = (priority > sel_priority) || /* prefer higher datatype priority */
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
index e502f7d9d31..7dc97ad5eab 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
@@ -38,7 +38,7 @@ static bNodeSocketTemplate sh_node_tex_wave_in[] = {
{ -1, 0, "" }
};
-const bool internal_links[5] = {0,0,0,0,0};
+const bool internal_links[5] = {0, 0, 0, 0, 0};
static bNodeSocketTemplate sh_node_tex_wave_out[] = {
{ SOCK_RGBA, 0, N_("Color"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_NO_INTERNAL_LINK},