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-07-27 15:04:28 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-07-27 15:05:22 +0300
commit183874841b521a9c9e031fe3528db3cf0d826b3a (patch)
treec70fb4f472de7d197e21a402fe55c18a5a73eb18 /intern/cycles/render/nodes.cpp
parent5f95ffe35034120189340cd413f24979da92109e (diff)
Cycles: Some minor tweaks to emission sharder
- Nodification of shader nodes changed default strength from 10 to 1. If that was intentional, IMO should happen as a separate commit. - Fixed indentation.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r--intern/cycles/render/nodes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index e26084c690b..ed4debdddfc 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -2323,7 +2323,7 @@ NODE_DEFINE(EmissionNode)
NodeType* type = NodeType::add("emission", create, NodeType::SHADER);
SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f));
- SOCKET_IN_FLOAT(strength, "Strength", 1.0f);
+ SOCKET_IN_FLOAT(strength, "Strength", 10.0f);
SOCKET_IN_FLOAT(surface_mix_weight, "SurfaceMixWeight", 0.0f, SocketType::SVM_INTERNAL);
SOCKET_OUT_CLOSURE(emission, "Emission");
@@ -2344,7 +2344,7 @@ void EmissionNode::compile(SVMCompiler& compiler)
if(color_in->link || strength_in->link) {
compiler.add_node(NODE_EMISSION_WEIGHT,
compiler.stack_assign(color_in),
- compiler.stack_assign(strength_in));
+ compiler.stack_assign(strength_in));
}
else
compiler.add_node(NODE_CLOSURE_SET_WEIGHT, color * strength);