[Bf-blender-cvs] [74ae900] master: Cycles: Fix mistake in PathRayFlag, one value was used twice.

Thomas Dinges noreply at git.blender.org
Thu Feb 27 20:42:18 CET 2014


Commit: 74ae900c676b5ad7d54857734a16a8527883844c
Author: Thomas Dinges
Date:   Thu Feb 27 20:41:36 2014 +0100
https://developer.blender.org/rB74ae900c676b5ad7d54857734a16a8527883844c

Cycles: Fix mistake in PathRayFlag, one value was used twice.

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 8d7adb2..60611d7 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -234,7 +234,7 @@ enum PathRayFlag {
 	PATH_RAY_DIFFUSE_ANCESTOR = 2048,
 	PATH_RAY_GLOSSY_ANCESTOR = 4096,
 	PATH_RAY_BSSRDF_ANCESTOR = 8192,
-	PATH_RAY_SINGLE_PASS_DONE = 8192,
+	PATH_RAY_SINGLE_PASS_DONE = 16384,
 
 	/* this gives collisions with localview bits
 	 * see: blender_util.h, grr - Campbell */




More information about the Bf-blender-cvs mailing list