diff options
author | Patrick Mours <pmours@nvidia.com> | 2020-07-28 16:46:09 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2020-07-28 16:46:09 +0300 |
commit | 8fbed7f7f507b4d1e0e4a576f138fd5256142240 (patch) | |
tree | f73321e15cbb3eb6666d08657be9923cf8705b54 | |
parent | bc0b75ea37327137445d81c9700882afae326a4c (diff) | |
parent | 9ff7820f62a8f0c6ab0de113b797de77a433cc21 (diff) |
Merge branch 'blender-v2.90-release'
-rw-r--r-- | intern/cycles/kernel/kernel_path.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index eb6c94fe104..c332d5ad3ec 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -665,11 +665,9 @@ ccl_device void kernel_path_trace( kernel_path_trace_setup(kg, sample, x, y, &rng_hash, &ray); -# ifndef __KERNEL_OPTIX__ if (ray.t == 0.0f) { return; } -# endif /* Initialize state. */ float3 throughput = make_float3(1.0f, 1.0f, 1.0f); |