diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-06-21 20:09:54 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-06-21 20:09:54 +0300 |
| commit | dd6d0aefcc56288bfe154fe06df56163d6961372 (patch) | |
| tree | 7b74c26bcd48d0fbd844fd8b286c9a399813b203 /intern/cycles/kernel/integrator/subsurface_disk.h | |
| parent | c27a395d8cd8b58b3155cfdc26ae35198fbcdb14 (diff) | |
| parent | 714001683888770f9d870ba73edd65f4c2757bda (diff) | |
Merge branch 'master' into asset-greasepencilasset-greasepencil
Diffstat (limited to 'intern/cycles/kernel/integrator/subsurface_disk.h')
| -rw-r--r-- | intern/cycles/kernel/integrator/subsurface_disk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/integrator/subsurface_disk.h b/intern/cycles/kernel/integrator/subsurface_disk.h index 34330671748..ae857c50493 100644 --- a/intern/cycles/kernel/integrator/subsurface_disk.h +++ b/intern/cycles/kernel/integrator/subsurface_disk.h @@ -113,7 +113,7 @@ ccl_device_inline bool subsurface_disk(KernelGlobals kg, for (int hit = 0; hit < num_eval_hits; hit++) { /* Get geometric normal. */ const int object = ss_isect.hits[hit].object; - const int object_flag = kernel_tex_fetch(__object_flag, object); + const int object_flag = kernel_data_fetch(object_flag, object); float3 hit_Ng = ss_isect.Ng[hit]; if (path_flag & PATH_RAY_SUBSURFACE_BACKFACING) { hit_Ng = -hit_Ng; |