diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-07 16:54:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-07 16:54:32 +0300 |
| commit | 4610ca599a778a33b958d196a7782cebd5758072 (patch) | |
| tree | d23e5019384fb2e72edb0c16f98c9302aa03f0eb /intern | |
| parent | 36b9ee1277519f1ae471afbc0a99e26eee1acbe4 (diff) | |
| parent | 33201a48b0afe25798c29902b6af72c7721b2cae (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 1 | ||||
| -rw-r--r-- | intern/cycles/util/util_transform.h | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index 0a5998a6544..0d39ac8f5ec 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -266,7 +266,6 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg, /* Get the Embree scene for this intersection. */ RTCGeometry geom = rtcGetGeometry(kernel_data.bvh.scene, local_object * 2); if(geom) { - Transform ob_itfm; float3 P = ray.P; float3 dir = ray.D; float3 idir = ray.D; diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h index 32b3b28f4d6..6bdf56fda7f 100644 --- a/intern/cycles/util/util_transform.h +++ b/intern/cycles/util/util_transform.h @@ -422,8 +422,13 @@ ccl_device void transform_motion_array_interpolate(Transform *tfm, transform_compose(tfm, &decomp); } -#ifdef __EMBREE__ -ccl_device void transform_motion_array_interpolate_straight(Transform *tfm, const ccl_global DecomposedTransform *motion, uint numsteps, float time) +#ifndef __KERNEL_GPU__ + +#ifdef WITH_EMBREE +ccl_device void transform_motion_array_interpolate_straight(Transform *tfm, + const ccl_global DecomposedTransform *motion, + uint numsteps, + float time) { /* Figure out which steps we need to interpolate. */ int maxstep = numsteps - 1; @@ -444,8 +449,6 @@ ccl_device void transform_motion_array_interpolate_straight(Transform *tfm, cons } #endif -#ifndef __KERNEL_GPU__ - class BoundBox2D; ccl_device_inline bool operator==(const DecomposedTransform& A, const DecomposedTransform& B) |