[Bf-blender-cvs] [ac0f6c9] cycles_bvh: Merge remote-tracking branch 'origin/master' into cycles_bvh

[Sergey Sharybin]

Commit: ac0f6c957681da3e01429ec035fa9dae74eb9032
Author: Sergey Sharybin
Date:   Wed Jun 15 13:24:46 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBac0f6c957681da3e01429ec035fa9dae74eb9032

Merge remote-tracking branch 'origin/master' into cycles_bvh

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



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

diff --cc intern/cycles/kernel/kernel_types.h
index 0f413de,aa5eeeb..2ec7a23
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@@ -292,15 -292,11 +292,14 @@@ enum PathRayFlag 
  	PATH_RAY_CURVE = 512, /* visibility flag to define curve segments */
  	PATH_RAY_VOLUME_SCATTER = 1024, /* volume scattering */
  
 -	PATH_RAY_ALL_VISIBILITY = (1|2|4|8|16|32|64|128|256|512|1024),
 +	/* Special flag to tag unaligned BVH nodes. */
 +	PATH_RAY_NODE_UNALIGNED = 2048,
  
- 	/* note that these can use maximum 12 bits, the other are for layers */
 -	PATH_RAY_MIS_SKIP = 2048,
 -	PATH_RAY_DIFFUSE_ANCESTOR = 4096,
 -	PATH_RAY_SINGLE_PASS_DONE = 8192,
 +	PATH_RAY_ALL_VISIBILITY = (1|2|4|8|16|32|64|128|256|512|1024|2048),
 +
 +	PATH_RAY_MIS_SKIP = 4096,
 +	PATH_RAY_DIFFUSE_ANCESTOR = 8192,
 +	PATH_RAY_SINGLE_PASS_DONE = 16384,
  };
  
  /* Closure Label */