diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-26 23:56:59 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-26 23:56:59 +0400 |
| commit | c16f751475a326027de37c269a394dcf1d2fb243 (patch) | |
| tree | 3489d88a4ce6a606175d61a798a9b4bf17f4fbc5 /source/blender/gpu/GPU_material.h | |
| parent | 8cb78f1094e9b28b84a49edac47d32b8c333a545 (diff) | |
Fix T37633: duplicate value GPUDynamicType could cause GLSL render issues.
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 8c4c7d47558..63e5f64e6bc 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -167,6 +167,7 @@ typedef enum GPUDynamicType { GPU_DYNAMIC_OBJECT_IMAT = 4, GPU_DYNAMIC_OBJECT_COLOR = 5, GPU_DYNAMIC_OBJECT_AUTOBUMPSCALE = 15, + GPU_DYNAMIC_LAMP_FIRST = 6, GPU_DYNAMIC_LAMP_DYNVEC = 6, GPU_DYNAMIC_LAMP_DYNCO = 7, @@ -178,11 +179,11 @@ typedef enum GPUDynamicType { GPU_DYNAMIC_SAMPLER_2DBUFFER = 12, GPU_DYNAMIC_SAMPLER_2DIMAGE = 13, GPU_DYNAMIC_SAMPLER_2DSHADOW = 14, - GPU_DYNAMIC_LAMP_DISTANCE = 15, - GPU_DYNAMIC_LAMP_ATT1 = 16, - GPU_DYNAMIC_LAMP_ATT2 = 17, - GPU_DYNAMIC_LAMP_SPOTSIZE = 18, - GPU_DYNAMIC_LAMP_SPOTBLEND = 19, + GPU_DYNAMIC_LAMP_DISTANCE = 16, + GPU_DYNAMIC_LAMP_ATT1 = 17, + GPU_DYNAMIC_LAMP_ATT2 = 18, + GPU_DYNAMIC_LAMP_SPOTSIZE = 19, + GPU_DYNAMIC_LAMP_SPOTBLEND = 20, } GPUDynamicType; typedef enum GPUDataType { |