diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-20 22:24:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-21 19:56:26 +0300 |
| commit | 5cc1d5fe17c4d22ae310fc1a74c626c0bb25aef7 (patch) | |
| tree | 8a0806ae650f028859a5282617fc8f3b5237af3d /intern/cycles/kernel/shaders | |
| parent | 7de387f4b56de3e069cce784c89e520fe77e5f1e (diff) | |
Fix T54107: bevel shader + normal map gives wrong result.
Diffstat (limited to 'intern/cycles/kernel/shaders')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_bevel.osl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/shaders/node_bevel.osl b/intern/cycles/kernel/shaders/node_bevel.osl index a5b185b6b4c..9c4ca15be17 100644 --- a/intern/cycles/kernel/shaders/node_bevel.osl +++ b/intern/cycles/kernel/shaders/node_bevel.osl @@ -23,9 +23,9 @@ shader node_bevel( output normal NormalOut = N) { /* Abuse texture call with special @bevel token. */ - NormalOut = (normal)(color)texture("@bevel", samples, Radius); + vector bevel_N = (normal)(color)texture("@bevel", samples, Radius); /* Preserve input normal. */ - NormalOut = normalize(N + (NormalOut - NormalIn)); + NormalOut = normalize(NormalIn + (bevel_N - N)); } |