[Bf-blender-cvs] [f250aa9] master: Fix T47323, no Fac output in Magic texture (OSL).

[Thomas Dinges]

Commit: f250aa9d86a35ae8bb6692a85ffe04610924fb08
Author: Thomas Dinges
Date:   Thu Feb 4 14:08:36 2016 +0100
Branches: master
https://developer.blender.org/rBf250aa9d86a35ae8bb6692a85ffe04610924fb08

Fix T47323, no Fac output in Magic texture (OSL).

===================================================================

M       intern/cycles/kernel/shaders/node_magic_texture.osl

===================================================================

diff --git a/intern/cycles/kernel/shaders/node_magic_texture.osl 
b/intern/cycles/kernel/shaders/node_magic_texture.osl
index c09523f..97f1fcd 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);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs