From 5412389af61f55d4e6a8ff271df01411b195e659 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 23 Jul 2012 14:48:19 +0000 Subject: fix for cycles bug in localview: see r48269, bits used for localview gave collisions with PathRayFlag's --- intern/cycles/kernel/kernel_types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'intern/cycles/kernel/kernel_types.h') 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) }; -- cgit v1.2.3