diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:11:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:13:33 +0300 |
| commit | 4422b3f9199cdd13c162ebc16c9e1d1b18f76bae (patch) | |
| tree | e1126c08d85fc4ce51be98b132ce5832f2e227cd /intern/cycles/kernel/kernel_bake.h | |
| parent | 734d1aec3f93b8757533284330afc2ac651442bd (diff) | |
Some fixes for CUDA runtime compile:
* When Baking wasn't used we got an error.
* On top of Volume Nodes (NODES_FEATURE_VOLUME), we now also check if we need volume sampling code,
so we can disable that as well and save some further compilation time.
Diffstat (limited to 'intern/cycles/kernel/kernel_bake.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index d0ca256f323..60110fb980a 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -16,7 +16,7 @@ CCL_NAMESPACE_BEGIN -#ifndef __NO_BAKING__ +#ifdef __BAKING__ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng, int pass_filter, int sample) @@ -483,7 +483,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, output[i] += make_float4(out.x, out.y, out.z, 1.0f) * output_fac; } -#endif /* __NO_BAKING__ */ +#endif /* __BAKING__ */ ccl_device void kernel_shader_evaluate(KernelGlobals *kg, ccl_global uint4 *input, |