diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-07 18:48:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-07 18:48:04 +0400 |
| commit | 7b0a46b1ff4409a599751392329341c161c7e3c0 (patch) | |
| tree | b0c435db7c95235d1adf8ba4eee29faa59f590e6 /intern/cycles/kernel/kernel_shader.h | |
| parent | 2dd33289876cfaf2d25be58fa2f63541616da339 (diff) | |
Fix CUDA/OpenCL compile errors in scattering commit.
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 35844dc4f65..b113e906e9d 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -1060,8 +1060,6 @@ ccl_device int shader_phase_sample_closure(KernelGlobals *kg, const ShaderData * return label; } -#endif - /* Volume Evaluation */ ccl_device void shader_eval_volume(KernelGlobals *kg, ShaderData *sd, @@ -1114,6 +1112,8 @@ ccl_device void shader_eval_volume(KernelGlobals *kg, ShaderData *sd, } } +#endif + /* Displacement Evaluation */ ccl_device void shader_eval_displacement(KernelGlobals *kg, ShaderData *sd, ShaderContext ctx) |