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:
authorThomas Dinges <blender@dingto.org>2013-05-16 00:38:17 +0400
committerThomas Dinges <blender@dingto.org>2013-05-16 00:38:17 +0400
commit9b59e2b95a5c5bc6f933720f384dc9abf34a6bf8 (patch)
treeac41f42608fee7b962d9ecf57626afc917106a1d /intern/cycles/kernel/closure/bsdf_toon.h
parent1df12416cac4e9c0339667626a41529a6a597e26 (diff)
Code cleanup / Cycles:
* Some simplification of closure code (Velvet and Toon).
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf_toon.h')
-rw-r--r--intern/cycles/kernel/closure/bsdf_toon.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_toon.h b/intern/cycles/kernel/closure/bsdf_toon.h
index 40001bf7531..ac66114ca76 100644
--- a/intern/cycles/kernel/closure/bsdf_toon.h
+++ b/intern/cycles/kernel/closure/bsdf_toon.h
@@ -52,14 +52,12 @@ __device void bsdf_diffuse_toon_blur(ShaderClosure *sc, float roughness)
__device float3 bsdf_toon_get_intensity(float max_angle, float smooth, float angle)
{
- float is;
+ float is = 0.0f;
if(angle < max_angle)
is = 1.0f;
else if(angle < (max_angle + smooth) && smooth != 0.0f)
is = (1.0f - (angle - max_angle)/smooth);
- else
- is = 0.0f;
return make_float3(is, is, is);
}