[Bf-blender-cvs] [8cc7460] master: Smoke: Don't use `min` as an uniform name

[Sergey Sharybin]

Commit: 8cc746049577bce0d5d54c4f6f4f807d4e119159
Author: Sergey Sharybin
Date:   Mon Apr 4 11:58:27 2016 +0200
Branches: master
https://developer.blender.org/rB8cc746049577bce0d5d54c4f6f4f807d4e119159

Smoke: Don't use `min` as an uniform name

This is an attempt to fix report T47991.

===================================================================

M	source/blender/editors/space_view3d/drawvolume.c
M	source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl

===================================================================

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 6f6dba3..e93d840 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -331,7 +331,7 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob,
 	int densityscale_location = GPU_shader_get_uniform(shader, "density_scale");
 	int invsize_location = GPU_shader_get_uniform(shader, "invsize");
 	int ob_sizei_location = GPU_shader_get_uniform(shader, "ob_sizei");
-	int min_location = GPU_shader_get_uniform(shader, "min");
+	int min_location = GPU_shader_get_uniform(shader, "min_location");
 
 	GPU_shader_bind(shader);
 
diff --git a/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl
index daabf9b..297486a 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;
 }