diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
| commit | ab62b7e971ab446c8c286fac305a846f83161e50 (patch) | |
| tree | 7fd5a67b9653e2e10efee94374e812e76da86a05 /intern/cycles/kernel/kernels/cpu/filter_cpu.h | |
| parent | cc8424e73324b772621045c1856f9a8869faa859 (diff) | |
| parent | dd6bf3f84a9137affbcd8ba0fc957c32b8c0aff7 (diff) | |
Merge branch 'origin/blender2.8' into temp-ui-layout-2.8temp-ui-layout-2.8
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu/filter_cpu.h')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/filter_cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/filter_cpu.h b/intern/cycles/kernel/kernels/cpu/filter_cpu.h index b62aa9663ec..e036b53b810 100644 --- a/intern/cycles/kernel/kernels/cpu/filter_cpu.h +++ b/intern/cycles/kernel/kernels/cpu/filter_cpu.h @@ -95,6 +95,7 @@ void KERNEL_FUNCTION_FULL_NAME(filter_nlm_update_output)(int dx, int dy, float *difference_image, float *image, + float *temp_image, float *out_image, float *accum_image, int* rect, |