diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-11-11 17:29:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-11-11 17:29:35 +0300 |
| commit | ce395c84a34225a820002ad551bee324b072f034 (patch) | |
| tree | b981bdd0a69272abb6c0aaf1e7cb4f2530f7e254 /intern/cycles/device/cpu | |
| parent | 06a74e78169ff60082716c0bd85c0b76de6bb885 (diff) | |
| parent | d26d3cfe193793728cac77be9b44463a84a0f57e (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/device/cpu')
| -rw-r--r-- | intern/cycles/device/cpu/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/cpu/kernel.h b/intern/cycles/device/cpu/kernel.h index 406bd07ab3d..2d1de975c2b 100644 --- a/intern/cycles/device/cpu/kernel.h +++ b/intern/cycles/device/cpu/kernel.h @@ -42,7 +42,7 @@ class CPUKernels { IntegratorInitFunction integrator_init_from_camera; IntegratorInitFunction integrator_init_from_bake; - IntegratorFunction integrator_intersect_closest; + IntegratorShadeFunction integrator_intersect_closest; IntegratorFunction integrator_intersect_shadow; IntegratorFunction integrator_intersect_subsurface; IntegratorFunction integrator_intersect_volume_stack; |