[Bf-blender-cvs] [bea6cfec1a] cycles_split_kernel: Merge branch 'master' into cycles_split_kernel

[Mai Lavelle]

Commit: bea6cfec1a08a967db923b3534daf2b9329184c7
Author: Mai Lavelle
Date:   Thu Feb 2 19:46:27 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBbea6cfec1a08a967db923b3534daf2b9329184c7

Merge branch 'master' into cycles_split_kernel

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



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

diff --cc intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
index 316ed23cc8,5d951b972e..3a7f1629e6
--- a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
+++ b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
@@@ -150,19 -143,18 +151,18 @@@ ccl_device void kernel_holdout_emission
  		{
  			if(kernel_data.background.transparent) {
  				float3 holdout_weight;
- 
- 				if(ccl_fetch(sd, flag) & SD_HOLDOUT_MASK)
+ 				if(ccl_fetch(sd, object_flag) & SD_OBJECT_HOLDOUT_MASK) {
  					holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
- 				else
+ 				}
+ 				else {
  					holdout_weight = shader_holdout_eval(kg, sd);
- 
+ 				}
  				/* any throughput is ok, should all be identical here */
 -				L_transparent_coop[ray_index] += average(holdout_weight*throughput);
 +				kernel_split_state.L_transparent[ray_index] += average(holdout_weight*throughput);
  			}
- 
- 			if(ccl_fetch(sd, flag) & SD_HOLDOUT_MASK) {
+ 			if(ccl_fetch(sd, object_flag) & SD_OBJECT_HOLDOUT_MASK) {
  				ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER);
 -				*enqueue_flag = 1;
 +				enqueue_flag = 1;
  			}
  		}
  #endif  /* __HOLDOUT__ */