Commit: c16f751475a326027de37c269a394dcf1d2fb243
Author: Brecht Van Lommel
Date: Tue Nov 26 20:56:59 2013 +0100
http://developer.blender.org/rBc16f751475a326027de37c269a394dcf1d2fb243
Fix T37633: duplicate value GPUDynamicType could cause GLSL render issues.
===================================================================
M source/blender/gpu/GPU_material.h
===================================================================
diff --git a/source/blender/gpu/GPU_material.h
b/source/blender/gpu/GPU_material.h
index 8c4c7d4..63e5f64 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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
