diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-06 19:19:36 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-06 19:19:36 +0400 |
commit | 4f1cdb3e42c5a1103dde3794a87d7e4765702c72 (patch) | |
tree | 33be9329ce3f4e76f961094d8e2364b8b8c9bf71 /intern | |
parent | c93d7a193ab450f89664a70e0204c14531be4877 (diff) |
Code cleanup: patch by Thomas to fix PassType values to be consecutive.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 25ff7f73888..8c4334d61f3 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -173,25 +173,25 @@ typedef enum PassType { PASS_NONE = 0, PASS_COMBINED = 1, PASS_DEPTH = 2, - PASS_NORMAL = 8, - PASS_UV = 16, - PASS_OBJECT_ID = 32, - PASS_MATERIAL_ID = 64, - PASS_DIFFUSE_COLOR = 128, - PASS_GLOSSY_COLOR = 256, - PASS_TRANSMISSION_COLOR = 512, - PASS_DIFFUSE_INDIRECT = 1024, - PASS_GLOSSY_INDIRECT = 2048, - PASS_TRANSMISSION_INDIRECT = 4096, - PASS_DIFFUSE_DIRECT = 8192, - PASS_GLOSSY_DIRECT = 16384, - PASS_TRANSMISSION_DIRECT = 32768, - PASS_EMISSION = 65536, - PASS_BACKGROUND = 131072, - PASS_AO = 262144, - PASS_SHADOW = 524288, - PASS_MOTION = 1048576, - PASS_MOTION_WEIGHT = 2097152 + PASS_NORMAL = 4, + PASS_UV = 8, + PASS_OBJECT_ID = 16, + PASS_MATERIAL_ID = 32, + PASS_DIFFUSE_COLOR = 64, + PASS_GLOSSY_COLOR = 128, + PASS_TRANSMISSION_COLOR = 256, + PASS_DIFFUSE_INDIRECT = 512, + PASS_GLOSSY_INDIRECT = 1024, + PASS_TRANSMISSION_INDIRECT = 2048, + PASS_DIFFUSE_DIRECT = 4096, + PASS_GLOSSY_DIRECT = 8192, + PASS_TRANSMISSION_DIRECT = 16384, + PASS_EMISSION = 32768, + PASS_BACKGROUND = 65536, + PASS_AO = 131072, + PASS_SHADOW = 262144, + PASS_MOTION = 524288, + PASS_MOTION_WEIGHT = 1048576 } PassType; #define PASS_ALL (~0) |