diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-01-15 18:00:56 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-01-15 18:00:56 +0300 |
| commit | 9a76354585e2cd2011267e79bd99ca59a06588f8 (patch) | |
| tree | e775e7c44dc210ef9978b483930ade6a9b4d6fc5 /intern/cycles/kernel/kernels/opencl | |
| parent | 9137a4401440d3f3206e989f49f3539079d685b8 (diff) | |
Cycles-Bake: Custom Baking passes
The combined pass is built with the contributions the user finds fit.
It is useful for lightmap baking, as well as non-view dependent effects
baking.
The manual will be updated once we get closer to the 2.77 release.
Meanwhile the new page can be found here:
http://dalaifelinto.com/blender-manual/render/cycles/baking.html
Reviewers: sergey, brecht
Differential Revision: https://developer.blender.org/D1674
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel.cl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl index 4c9f7ba1d7c..0a44a4d0301 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel.cl @@ -99,7 +99,7 @@ __kernel void kernel_ocl_bake( ccl_global type *name, #include "../../kernel_textures.h" - int type, int sx, int sw, int offset, int sample) + int type, int filter, int sx, int sw, int offset, int sample) { KernelGlobals kglobals, *kg = &kglobals; @@ -115,7 +115,7 @@ __kernel void kernel_ocl_bake( #ifdef __NO_BAKING__ output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f); #else - kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, x, offset, sample); + kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, filter, x, offset, sample); #endif } } @@ -174,4 +174,4 @@ __kernel void kernel_ocl_convert_to_half_float( kernel_film_convert_to_half_float(kg, rgba, buffer, sample_scale, x, y, offset, stride); } -#endif // __COMPILE_ONLY_MEGAKERNEL__
\ No newline at end of file +#endif // __COMPILE_ONLY_MEGAKERNEL__ |