diff options
| -rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 6f6dba3cdde..e93d840eddd 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 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; } |