Blender Git Loki
Git Commits -> Revision 2c12015
Revision 2c12015 by Mai Lavelle (blender-v2.78-release, blender-v2.78b-release, blender-v2.78c-release, fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) September 14, 2016, 08:26 (GMT) |
Cycles: Fix bump mapping to use object space when used with true displacement Bump mapping was happening in world space while displacement happens in object space, causing shading errors when displacement type was used with bump mapping. To fix this the proper transforms are added to bump nodes. This is only done for automatic bump mapping however, to avoid visual changes from other uses of bump mapping. It would be nice to do this for all bump mapping to be consistent but that will have to wait till we can break compatibility. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2191 |
Commit Details:
Full Hash: 2c1201502dcac7c3febd7e09c228b05dd16b4fcd
Parent Commit: b67db67
Committed By: Sergey Sharybin
Lines Changed: +56, -20
8 Modified Paths:
/intern/cycles/kernel/shaders/node_bump.osl (+19, -6) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+19, -5) (Diff)
/intern/cycles/render/graph.cpp (+6, -4) (Diff)
/intern/cycles/render/graph.h (+3, -2) (Diff)
/intern/cycles/render/nodes.cpp (+4, -1) (Diff)
/intern/cycles/render/nodes.h (+1, -0) (Diff)
/intern/cycles/render/osl.cpp (+2, -1) (Diff)
/intern/cycles/render/svm.cpp (+2, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+19, -5) (Diff)
/intern/cycles/render/graph.cpp (+6, -4) (Diff)
/intern/cycles/render/graph.h (+3, -2) (Diff)
/intern/cycles/render/nodes.cpp (+4, -1) (Diff)
/intern/cycles/render/nodes.h (+1, -0) (Diff)
/intern/cycles/render/osl.cpp (+2, -1) (Diff)
/intern/cycles/render/svm.cpp (+2, -1) (Diff)