[Bf-blender-cvs] [e96986fa47f] master: Cycles: Fixed OpenCL render after the Embree checkin.
Stefan Werner
noreply at git.blender.org
Wed Nov 7 13:53:58 CET 2018
Commit: e96986fa47fe98a73227baa78dd51eb49128e4db
Author: Stefan Werner
Date: Wed Nov 7 13:53:56 2018 +0100
Branches: master
https://developer.blender.org/rBe96986fa47fe98a73227baa78dd51eb49128e4db
Cycles: Fixed OpenCL render after the Embree checkin.
===================================================================
M intern/cycles/util/util_transform.h
===================================================================
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__
More information about the Bf-blender-cvs
mailing list