Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Werner <stefan.werner@tangent-animation.com>2018-11-07 15:53:56 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2018-11-07 15:53:56 +0300
commite96986fa47fe98a73227baa78dd51eb49128e4db (patch)
tree6e2385aac59f02414289b886b3b9a3d74515be27
parent2c5531c0a521119a2f5c88b4ba2a67234c537d2b (diff)
Cycles: Fixed OpenCL render after the Embree checkin.
-rw-r--r--intern/cycles/util/util_transform.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h
index d3bfb1d5752..32b3b28f4d6 100644
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/util_transform.h
@@ -422,6 +422,7 @@ 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)
{
/* Figure out which steps we need to interpolate. */
@@ -441,6 +442,7 @@ ccl_device void transform_motion_array_interpolate_straight(Transform *tfm, cons
tfm->y = (1.0f - t) * step1.y + t * step2.y;
tfm->z = (1.0f - t) * step1.z + t * step2.z;
}
+#endif
#ifndef __KERNEL_GPU__