diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-08 17:23:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-08 17:23:13 +0400 |
| commit | 3e763d7e4dbbc4acb3deb7afb95e936ce950ebb5 (patch) | |
| tree | 9e14267999906ae1fd99e27b7b9b9b8ddf87552b /intern/cycles/render/graph.cpp | |
| parent | 28617bd7106b918bfd40305fdd709f3e73649d9c (diff) | |
Fix #35246: cycles has no simple way to combine bump and normal mapping. Now
the Bump node has a Normal input, so you can chain it after a Normal Map node.
Note that normal mapping always has to be done first because it is tied to the
particular mesh surface and tangents.
Diffstat (limited to 'intern/cycles/render/graph.cpp')
| -rw-r--r-- | intern/cycles/render/graph.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 50fee15c231..b026f07ce56 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -668,7 +668,7 @@ void ShaderGraph::bump_from_displacement() /* for displacement bump, clear the normal input in case the above loop * connected the setnormal out to the bump normalin */ - ShaderInput *bump_normal_in = bump->input("NormalIn"); + ShaderInput *bump_normal_in = bump->input("Normal"); if(bump_normal_in) bump_normal_in->link = NULL; |