diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 16:34:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 16:34:33 +0300 |
| commit | 78a6689aea1976d42ba0fca927f3e7572768e1fb (patch) | |
| tree | 5c16e6461f82c00ebef4906f748dba2dc360e80f /intern/cycles/kernel/kernel_id_passes.h | |
| parent | 6c10ec74d5ec3d6fbbc1531463c117332b91ebed (diff) | |
| parent | ddabb21d0584e9874e8e5c62c04abe496ec7334b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/kernel_id_passes.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_id_passes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_id_passes.h b/intern/cycles/kernel/kernel_id_passes.h index 8d092374d8b..0cd65b1f2e8 100644 --- a/intern/cycles/kernel/kernel_id_passes.h +++ b/intern/cycles/kernel/kernel_id_passes.h @@ -43,7 +43,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s atomic_add_and_fetch_float(buffer+slot*2+1, weight); break; } -#else /* __ATOMIC_PASS_WRITE__ */ +#else /* __ATOMIC_PASS_WRITE__ */ /* If the loop reaches an empty slot, the ID isn't in any slot yet - so add it! */ if(id_buffer[slot].x == ID_NONE) { id_buffer[slot].x = id; @@ -56,7 +56,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s id_buffer[slot].y += weight; break; } -#endif /* __ATOMIC_PASS_WRITE__ */ +#endif /* __ATOMIC_PASS_WRITE__ */ } } |