diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-23 18:48:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-23 18:48:19 +0400 |
| commit | 5412389af61f55d4e6a8ff271df01411b195e659 (patch) | |
| tree | 79a5563151bf5aa5d7f32154fe5889e861f92ad7 /intern/cycles/kernel/kernel_types.h | |
| parent | a5d08781fc9d113830d700181957b7ba3b37eb81 (diff) | |
fix for cycles bug in localview: see r48269, bits used for localview gave collisions with PathRayFlag's
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index d204b114b8e..30d45ad1118 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -172,6 +172,8 @@ enum PathRayFlag { PATH_RAY_ALL = (1|2|4|8|16|32|64|128|256|512), + /* this gives collisions with localview bits + * see: CYCLES_LOCAL_LAYER_HACK(), grr - Campbell */ PATH_RAY_LAYER_SHIFT = (32-20) }; |