[Bf-blender-cvs] [a52af3a] cycles_kernel_split: Enums should not be in CAPS.
Martijn Berger
noreply at git.blender.org
Mon May 4 17:14:07 CEST 2015
Commit: a52af3ac162db896ee3d549b5010d90e17cf98ea
Author: Martijn Berger
Date: Mon May 4 17:13:53 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rBa52af3ac162db896ee3d549b5010d90e17cf98ea
Enums should not be in CAPS.
===================================================================
M intern/cycles/kernel/kernel_types.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index f04b400..2f9833f 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1047,7 +1047,7 @@ typedef struct DebugData {
#define NUM_QUEUES 4
/* Queue names */
-enum QUEUE_NUMBER {
+enum QueueNumber {
QUEUE_ACTIVE_AND_REGENERATED_RAYS, /* All active rays and regenerated rays are enqueued here */
QUEUE_HITBG_BUFF_UPDATE_TOREGEN_RAYS, /* All
* 1.Background-hit rays,
@@ -1063,7 +1063,7 @@ enum QUEUE_NUMBER {
/* We use RAY_STATE_MASK to get ray_state (enums 0 to 5) */
#define RAY_STATE_MASK 0x007
#define RAY_FLAG_MASK 0x0F8
-enum RAY_STATE {
+enum RayState {
RAY_ACTIVE = 0, // Denotes ray is actively involved in path-iteration
RAY_INACTIVE = 1, // Denotes ray has completed processing all samples and is inactive
RAY_UPDATE_BUFFER = 2, // Denoted ray has exited path-iteration and needs to update output buffer
More information about the Bf-blender-cvs
mailing list