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>2016-02-03 17:00:55 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-03 17:00:55 +0300
commit3aa74828ab627723e6c98163bf6344ef1f009bcf (patch)
tree7dbb827dbb794d8f71ecd4c8047a8d0fff272f6c /intern/cycles/render/graph.cpp
parent87cbcd697b778b8c5500634a5193bdf67700b3a6 (diff)
Cycles: Cleanup, indentation and braces
Diffstat (limited to 'intern/cycles/render/graph.cpp')
-rw-r--r--intern/cycles/render/graph.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 32c176949ed..4a9b2f1103c 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -481,7 +481,8 @@ void ShaderGraph::remove_unneeded_nodes()
if(bg->outputs[0]->links.size()) {
/* Black color or zero strength, remove node */
if((!bg->inputs[0]->link && bg->inputs[0]->value == make_float3(0.0f, 0.0f, 0.0f)) ||
- (!bg->inputs[1]->link && bg->inputs[1]->value.x == 0.0f)) {
+ (!bg->inputs[1]->link && bg->inputs[1]->value.x == 0.0f))
+ {
vector<ShaderInput*> inputs = bg->outputs[0]->links;
relink(bg->inputs, inputs, NULL);
@@ -496,7 +497,8 @@ void ShaderGraph::remove_unneeded_nodes()
if(em->outputs[0]->links.size()) {
/* Black color or zero strength, remove node */
if((!em->inputs[0]->link && em->inputs[0]->value == make_float3(0.0f, 0.0f, 0.0f)) ||
- (!em->inputs[1]->link && em->inputs[1]->value.x == 0.0f)) {
+ (!em->inputs[1]->link && em->inputs[1]->value.x == 0.0f))
+ {
vector<ShaderInput*> inputs = em->outputs[0]->links;
relink(em->inputs, inputs, NULL);