Commit: da65ede7afb282929b8aca0fb795c067c2e61257
Author: Lukas Stockner
Date: Mon Jul 11 22:46:22 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBda65ede7afb282929b8aca0fb795c067c2e61257
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Conflicts:
intern/cycles/kernel/kernel_types.h
===================================================================
===================================================================
diff --cc intern/cycles/kernel/kernel_types.h
index 7ad03d8,5de58ba..650e109
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@@ -277,27 -277,29 +277,30 @@@ enum SamplingPattern
/* these flags values correspond to raytypes in osl.cpp, so keep them in
sync! */
enum PathRayFlag {
- PATH_RAY_CAMERA = 1,
- PATH_RAY_REFLECT = 2,
- PATH_RAY_TRANSMIT = 4,
- PATH_RAY_DIFFUSE = 8,
- PATH_RAY_GLOSSY = 16,
- PATH_RAY_SINGULAR = 32,
- PATH_RAY_TRANSPARENT = 64,
-
- PATH_RAY_SHADOW_OPAQUE = 128,
- PATH_RAY_SHADOW_TRANSPARENT = 256,
+ PATH_RAY_CAMERA = (1 << 0),
+ PATH_RAY_REFLECT = (1 << 1),
+ PATH_RAY_TRANSMIT = (1 << 2),
+ PATH_RAY_DIFFUSE = (1 << 3),
+ PATH_RAY_GLOSSY = (1 << 4),
+ PATH_RAY_SINGULAR = (1 << 5),
+ PATH_RAY_TRANSPARENT = (1 << 6),
+
+ PATH_RAY_SHADOW_OPAQUE = (1 << 7),
+ PATH_RAY_SHADOW_TRANSPARENT = (1 << 8),
PATH_RAY_SHADOW = (PATH_RAY_SHADOW_OPAQUE|PATH_RAY_SHADOW_TRANSPARENT),
- PATH_RAY_CURVE = 512, /* visibility flag to define curve segments */
- PATH_RAY_VOLUME_SCATTER = 1024, /* volume scattering */
+ PATH_RAY_CURVE = (1 << 9), /* visibility flag to define
curve segments */
+ PATH_RAY_VOLUME_SCATTER = (1 << 10), /* 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,
++ PATH_RAY_NODE_UNALIGNED = (1 << 11),
- PATH_RAY_MIS_SKIP = (1 << 11),
- PATH_RAY_DIFFUSE_ANCESTOR = (1 << 12),
- PATH_RAY_SINGLE_PASS_DONE = (1 << 13),
- PATH_RAY_DENOISING_PASS_DONE = (1 << 14),
- PATH_RAY_ALL_VISIBILITY = (1|2|4|8|16|32|64|128|256|512|1024|2048),
++ PATH_RAY_ALL_VISIBILITY = ((1 << 12)-1),
+
- PATH_RAY_MIS_SKIP = 4096,
- PATH_RAY_DIFFUSE_ANCESTOR = 8192,
- PATH_RAY_SINGLE_PASS_DONE = 16384,
++ PATH_RAY_MIS_SKIP = (1 << 12),
++ PATH_RAY_DIFFUSE_ANCESTOR = (1 << 13),
++ PATH_RAY_SINGLE_PASS_DONE = (1 << 14),
++ PATH_RAY_DENOISING_PASS_DONE = (1 << 15),
};
/* Closure Label */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
