diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-04 02:08:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-04 02:10:00 +0300 |
commit | bc870f17a7fbcf52e86306932c97058ca8bb6f21 (patch) | |
tree | 4176ccf09924d000640ef415417f138a724bf24f /intern | |
parent | 771b9c8010d47e79a1f3cde9e25ecd5f275c3fa4 (diff) |
Cleanup: style, shadow warning
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_id_passes.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_passes.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/shader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_id_passes.h b/intern/cycles/kernel/kernel_id_passes.h index 486c61d2ae5..8d092374d8b 100644 --- a/intern/cycles/kernel/kernel_id_passes.h +++ b/intern/cycles/kernel/kernel_id_passes.h @@ -22,7 +22,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s if(weight == 0.0f) { return; } - + for(int slot = 0; slot < num_slots; slot++) { ccl_global float2 *id_buffer = (ccl_global float2*)buffer; #ifdef __ATOMIC_PASS_WRITE__ diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h index e256a1819ed..49a1b2c848e 100644 --- a/intern/cycles/kernel/kernel_passes.h +++ b/intern/cycles/kernel/kernel_passes.h @@ -200,7 +200,7 @@ ccl_device_inline size_t kernel_write_id_pass_cpu(float *buffer, size_t depth, f return 0; } #else /* __KERNEL_CPU__ */ -#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) +#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) ccl_device_inline size_t kernel_write_id_slots_gpu(ccl_global float *buffer, size_t depth, float id, float matte_weight) { #endif /* __KERNEL_CPU__ */ diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 13075a1ee2c..4fce4b79f49 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -526,7 +526,7 @@ void ShaderManager::device_update_common(Device *device, flag |= SD_HAS_CONSTANT_EMISSION; uint32_t cryptomatte_id = util_murmur_hash3(shader->name.c_str(), shader->name.length(), 0); - + /* regular shader */ kshader->flags = flag; kshader->pass_id = shader->pass_id; |