[Bf-blender-cvs] [5cba64e] master: Cleanup, please follow existing style when adding new flags. ; )

Thomas Dinges noreply at git.blender.org
Wed Nov 12 09:43:45 CET 2014


Commit: 5cba64e30c232fcb85f5eab917fd84fe41de3263
Author: Thomas Dinges
Date:   Wed Nov 12 09:43:23 2014 +0100
Branches: master
https://developer.blender.org/rB5cba64e30c232fcb85f5eab917fd84fe41de3263

Cleanup, please follow existing style when adding new flags. ;)

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 65297ec..7d9bebf 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -622,7 +622,7 @@ enum ShaderDataFlag {
 	SD_SHADER_FLAGS = (SD_USE_MIS|SD_HAS_TRANSPARENT_SHADOW|SD_HAS_VOLUME|
 	                   SD_HAS_ONLY_VOLUME|SD_HETEROGENEOUS_VOLUME|
 	                   SD_HAS_BSSRDF_BUMP|SD_VOLUME_EQUIANGULAR|SD_VOLUME_MIS|
-	                   SD_VOLUME_CUBIC | SD_HAS_BUMP),
+	                   SD_VOLUME_CUBIC|SD_HAS_BUMP),
 
 	/* object flags */
 	SD_HOLDOUT_MASK             = (1 << 21),  /* holdout for camera rays */




More information about the Bf-blender-cvs mailing list