[Bf-blender-cvs] [7eba4c65ebe] temp_cryptomatte: Fixed errors from merging

[Stefan Werner]

Commit: 7eba4c65ebe2faec409f20c71818a34452b3b5cd
Author: Stefan Werner
Date:   Wed Apr 12 11:46:36 2017 +0200
Branches: temp_cryptomatte
https://developer.blender.org/rB7eba4c65ebe2faec409f20c71818a34452b3b5cd

Fixed errors from merging

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

M	intern/cycles/kernel/kernel_passes.h
M	intern/cycles/kernel/kernel_shader.h

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

diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h
index 9c4121b96c1..35db95a06aa 100644
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -164,7 +164,7 @@ ccl_device_inline void kernel_write_data_passes(KernelGlobals *kg, ccl_global fl
 	int aov_count = 0;
 	
 	// TODO: Write cryptomatte AOV
-	if(kernel_data.film.use_cryptomatte) {
+	if(kernel_data.film.use_cryptomatte & CRYPT_OBJECT) {
 		float matte_weight = state->matte_weight * (1.0f - average(shader_bsdf_transparency(kg, sd)));
 		bool initialize_slots = (sample == 0) && (state->transparent_bounce == 0);
 		float id = object_cryptomatte_id(kg, sd->object);
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index e94edaea0f8..a1d6c8f3ac3 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -1138,7 +1138,7 @@ ccl_device bool shader_transparent_shadow(KernelGlobals *kg, Intersection *isect
 
 ccl_device float shader_cryptomatte_id(KernelGlobals *kg, int shader)
 {
-	return __int_as_float(kernel_tex_fetch(__shader_flag, (shader & SHADER_MASK) * SHADER_SIZE + 13));
+	return __int_as_float(kernel_tex_fetch(__shader_flag, (shader & SHADER_MASK) * SHADER_SIZE + 5));
 }
 
 CCL_NAMESPACE_END