diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-09-03 04:37:17 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-09-11 20:49:05 +0300 |
| commit | 013b46d6bda4388736d7953746d6b335ce495b16 (patch) | |
| tree | 59f8974ed14e7cf3e01ea369590da326dd9a6ed0 /intern/cycles/kernel/shaders | |
| parent | 92a2c49aab55a2c459a8f6d50e730bdcda966eb5 (diff) | |
Cycles: Replace object index hack with actual checks for SD_TRANSFORM_APPLIED
Using ones complement for detecting if transform has been applied was confusing
and led to several bugs. With this proper checks are made.
Also added a few transforms where they were missing, mostly affecting baking
and displacement when `P` is used in the shader (previously `P` was in the
wrong space for these shaders)
Also removed `TIME_INVALID` as this may have resulted in incorrect
transforms in some cases.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2192
Diffstat (limited to 'intern/cycles/kernel/shaders')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_output_displacement.osl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_output_displacement.osl b/intern/cycles/kernel/shaders/node_output_displacement.osl index d0688cfda8d..294b8dd6bf2 100644 --- a/intern/cycles/kernel/shaders/node_output_displacement.osl +++ b/intern/cycles/kernel/shaders/node_output_displacement.osl @@ -18,6 +18,8 @@ displacement node_output_displacement(float Displacement = 0.0) { - P += N * Displacement * 0.1; /* todo: get rid of this factor */ + vector dP = normalize(transform("object", N)); + dP *= Displacement * 0.1; /* todo: get rid of this factor */ + P += transform("object", "world", dP); } |