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>2016-02-04 16:08:36 +0300
committerThomas Dinges <blender@dingto.org>2016-02-04 16:08:36 +0300
commitf250aa9d86a35ae8bb6692a85ffe04610924fb08 (patch)
treedc2e929dfc10562968ad9fdb832ced1dbaeb40dc /intern/cycles/kernel/shaders
parentac53999d1b776aa3508375521bb96739b14140ce (diff)
Fix T47323, no Fac output in Magic texture (OSL).
Diffstat (limited to 'intern/cycles/kernel/shaders')
-rw-r--r--intern/cycles/kernel/shaders/node_magic_texture.osl2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_magic_texture.osl b/intern/cycles/kernel/shaders/node_magic_texture.osl
index c09523f205b..97f1fcd76b5 100644
--- a/intern/cycles/kernel/shaders/node_magic_texture.osl
+++ b/intern/cycles/kernel/shaders/node_magic_texture.osl
@@ -97,6 +97,7 @@ shader node_magic_texture(
float Distortion = 5.0,
float Scale = 5.0,
point Vector = P,
+ output float Fac = 0.0,
output color Color = 0.0)
{
point p = Vector;
@@ -105,5 +106,6 @@ shader node_magic_texture(
p = transform(mapping, p);
Color = magic(p * Scale, Depth, Distortion);
+ Fac = (Color[0] + Color[1] + Color[2]) * (1.0/3.0);
}