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/device | |
| 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/device')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/device/device_task.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_task.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 3241f32e006..83447b7a5f3 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -397,7 +397,7 @@ public: #ifdef WITH_OSL OSLShader::thread_init(&kg, &kernel_globals, &osl_globals); #endif - void(*shader_kernel)(KernelGlobals*, uint4*, float4*, float*, int, int, int, int); + void(*shader_kernel)(KernelGlobals*, uint4*, float4*, float*, int, int, int, int, int); #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 if(system_cpu_support_avx2()) { @@ -440,6 +440,7 @@ public: (float4*)task.shader_output, (float*)task.shader_output_luma, task.shader_eval_type, + task.shader_filter, x, task.offset, sample); diff --git a/intern/cycles/device/device_task.cpp b/intern/cycles/device/device_task.cpp index 0cae118a692..1f1128a28f8 100644 --- a/intern/cycles/device/device_task.cpp +++ b/intern/cycles/device/device_task.cpp @@ -30,7 +30,7 @@ DeviceTask::DeviceTask(Type type_) : type(type_), x(0), y(0), w(0), h(0), rgba_byte(0), rgba_half(0), buffer(0), sample(0), num_samples(1), shader_input(0), shader_output(0), shader_output_luma(0), - shader_eval_type(0), shader_x(0), shader_w(0) + shader_eval_type(0), shader_filter(0), shader_x(0), shader_w(0) { last_update_time = time_dt(); } diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index 7654508d4a5..d7912f386f5 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -48,6 +48,7 @@ public: device_ptr shader_input; device_ptr shader_output, shader_output_luma; int shader_eval_type; + int shader_filter; int shader_x, shader_w; DeviceTask(Type type = PATH_TRACE); |