From 9dc5367c89f467e516620b6ff15e2eb35b26fdee Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 17 May 2016 22:08:34 +0200 Subject: Cleanup code style inconsistency in last commits. --- intern/cycles/render/graph.cpp | 2 +- intern/cycles/render/nodes.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 920f5c7b50d..15c89cc4b51 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -507,7 +507,7 @@ void ShaderGraph::constant_fold() traverse_queue.pop(); done.insert(node); foreach(ShaderOutput *output, node->outputs) { - if (output->links.size() == 0) { + if(output->links.size() == 0) { continue; } /* Schedule node which was depending on the value, diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 1eb0365004c..194723e3641 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1379,7 +1379,7 @@ void PointDensityTextureNode::compile(SVMCompiler& compiler) __float_as_int(0.0f), compiler.stack_assign(density_out)); } - if (use_color) { + if(use_color) { compiler.add_node(NODE_VALUE_V, compiler.stack_assign(color_out)); compiler.add_node(NODE_VALUE_V, make_float3(TEX_IMAGE_MISSING_R, TEX_IMAGE_MISSING_G, @@ -3351,7 +3351,7 @@ bool MixNode::constant_fold(ShaderGraph *graph, ShaderOutput * /*socket*/, float if(!fac_in->link) { /* factor 0.0 */ if(fac_in->value.x == 0.0f) { - if (color1_in->link) + if(color1_in->link) graph->relink(this, color_out, color1_in->link); else *optimized_value = color1_in->value; @@ -3359,7 +3359,7 @@ bool MixNode::constant_fold(ShaderGraph *graph, ShaderOutput * /*socket*/, float } /* factor 1.0 */ else if(fac_in->value.x == 1.0f) { - if (color2_in->link) + if(color2_in->link) graph->relink(this, color_out, color2_in->link); else *optimized_value = color2_in->value; @@ -4322,7 +4322,7 @@ RGBCurvesNode::RGBCurvesNode() void RGBCurvesNode::compile(SVMCompiler& compiler) { - if (curves.size() == 0) + if(curves.size() == 0) return; ShaderInput *fac_in = input("Fac"); @@ -4343,7 +4343,7 @@ void RGBCurvesNode::compile(SVMCompiler& compiler) void RGBCurvesNode::compile(OSLCompiler& compiler) { - if (curves.size() == 0) + if(curves.size() == 0) return; compiler.parameter_color_array("ramp", curves); @@ -4367,7 +4367,7 @@ VectorCurvesNode::VectorCurvesNode() void VectorCurvesNode::compile(SVMCompiler& compiler) { - if (curves.size() == 0) + if(curves.size() == 0) return; ShaderInput *fac_in = input("Fac"); @@ -4388,7 +4388,7 @@ void VectorCurvesNode::compile(SVMCompiler& compiler) void VectorCurvesNode::compile(OSLCompiler& compiler) { - if (curves.size() == 0) + if(curves.size() == 0) return; compiler.parameter_color_array("ramp", curves); @@ -4411,7 +4411,7 @@ RGBRampNode::RGBRampNode() void RGBRampNode::compile(SVMCompiler& compiler) { - if (ramp.size() == 0 || ramp.size() != ramp_alpha.size()) + if(ramp.size() == 0 || ramp.size() != ramp_alpha.size()) return; ShaderInput *fac_in = input("Fac"); @@ -4432,7 +4432,7 @@ void RGBRampNode::compile(SVMCompiler& compiler) void RGBRampNode::compile(OSLCompiler& compiler) { - if (ramp.size() == 0 || ramp.size() != ramp_alpha.size()) + if(ramp.size() == 0 || ramp.size() != ramp_alpha.size()) return; compiler.parameter_color_array("ramp_color", ramp); -- cgit v1.2.3