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/geom/geom_triangle.h | |
| 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/geom/geom_triangle.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h index d3289d6572c..8bd01e1008d 100644 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/geom_triangle.h @@ -52,8 +52,8 @@ ccl_device_inline void triangle_point_normal(KernelGlobals *kg, int object, int float t = 1.0f - u - v; *P = (u*v0 + v*v1 + t*v2); - /* get object flags, instance-aware */ - int object_flag = kernel_tex_fetch(__object_flag, object >= 0 ? object : ~object); + /* get object flags */ + int object_flag = kernel_tex_fetch(__object_flag, object); /* compute normal */ if(object_flag & SD_NEGATIVE_SCALE_APPLIED) |