diff options
| author | Raja Kedia(miyagix) <rajakedia2222@gmail.com> | 2017-12-14 21:47:35 +0300 |
|---|---|---|
| committer | Raja Kedia(miyagix) <rajakedia2222@gmail.com> | 2017-12-14 21:47:35 +0300 |
| commit | 450eb4ef6c54108e16164aa0820ee00fea9b8b48 (patch) | |
| tree | 643a8c2b026205961d2539ac7a5bf363e5f5f500 /intern/cycles/device/device_denoising.h | |
| parent | 31d5262cece4c5644a36cf0511bc42007a2c1e6d (diff) | |
| parent | ba256b32ee5d3ab7991fe5abbb47071ccfe8577c (diff) | |
Merge remote-tracking branch 'origin' into soc-2017-sculpting_brushsoc-2017-sculpting_brush
Diffstat (limited to 'intern/cycles/device/device_denoising.h')
| -rw-r--r-- | intern/cycles/device/device_denoising.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/device/device_denoising.h b/intern/cycles/device/device_denoising.h index 25b93c2ad74..def7b72f67d 100644 --- a/intern/cycles/device/device_denoising.h +++ b/intern/cycles/device/device_denoising.h @@ -58,8 +58,6 @@ public: )> non_local_means; function<bool(device_ptr color_ptr, device_ptr color_variance_ptr, - device_ptr guide_ptr, - device_ptr guide_variance_ptr, device_ptr output_ptr )> reconstruct; function<bool()> construct_transform; |