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/editors
parent673ddd48da885954f888031233807be2d342fa8a (diff)
Smoke: Don't use `min` as an uniform name
This is an attempt to fix report T47991.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_view3d/drawvolume.c2
1 files changed, 1 insertions, 1 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);