Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-04 12:58:27 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-04 12:58:27 +0300
commit8cc746049577bce0d5d54c4f6f4f807d4e119159 (patch)
tree85d8af07f2aae1b523cccf3f8c930c363cd97f06 /source/blender/gpu
parent673ddd48da885954f888031233807be2d342fa8a (diff)
Smoke: Don't use `min` as an uniform name
This is an attempt to fix report T47991.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl
index daabf9b97a3..297486ae26a 100644
--- a/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl
@@ -1,12 +1,12 @@
varying vec3 coords;
-uniform vec3 min;
+uniform vec3 min_location;
uniform vec3 invsize;
uniform vec3 ob_sizei;
void main()
{
gl_Position = gl_ModelViewProjectionMatrix * vec4(gl_Vertex.xyz * ob_sizei, 1.0);
- coords = (gl_Vertex.xyz - min) * invsize;
+ coords = (gl_Vertex.xyz - min_location) * invsize;
}