Commit: a29bd4f810e7dd437901b0a318f030b107ce17e1
Author: Stefan Werner
Date:   Wed Apr 12 14:05:04 2017 +0200
Branches: temp_cryptomatte
https://developer.blender.org/rBa29bd4f810e7dd437901b0a318f030b107ce17e1

Cycles: fixed writing of Cryptomatte AOVs

===================================================================

M       intern/cycles/kernel/kernel_passes.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_passes.h 
b/intern/cycles/kernel/kernel_passes.h
index 35db95a06aa..1b35447ee10 100644
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -172,7 +172,7 @@ ccl_device_inline void 
kernel_write_data_passes(KernelGlobals *kg, ccl_global fl
                kernel_assert(kernel_data.film.pass_aov[0] & (1 << 31));
                kernel_write_id_slots(buffer + pass_offset, 
kernel_data.film.use_cryptomatte & 255, id, matte_weight, initialize_slots);
                state->written_aovs |= (1 << 0);
-               aov_count++;
+               aov_count += kernel_data.film.use_cryptomatte & 255;
        }
        if(kernel_data.film.use_cryptomatte & CRYPT_MATERIAL) {
                float matte_weight = state->matte_weight * (1.0f - 
average(shader_bsdf_transparency(kg, sd)));
@@ -182,7 +182,7 @@ ccl_device_inline void 
kernel_write_data_passes(KernelGlobals *kg, ccl_global fl
                kernel_assert(kernel_data.film.pass_aov[aov_count] & (1 << 31));
                kernel_write_id_slots(buffer + pass_offset, 
kernel_data.film.use_cryptomatte & 255, id, matte_weight, initialize_slots);
                state->written_aovs |= (1 << aov_count);
-               aov_count++;
+               aov_count += kernel_data.film.use_cryptomatte & 255;
        }
        // end TODO

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to