bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Smoke: Don't use min as an uniform name

Browse Source 
This is an attempt to fix report T47991.
This commit is contained in:
Sergey Sharybin 2016-04-04 11:58:27 +02:00
parent 673ddd48da
commit 8cc7460495
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/drawvolume.c
View File

@ -331,7 +331,7 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob,
int densityscale_location = GPU_shader_get_uniform(shader, "density_scale"); int densityscale_location = GPU_shader_get_uniform(shader, "density_scale");
int invsize_location = GPU_shader_get_uniform(shader, "invsize"); int invsize_location = GPU_shader_get_uniform(shader, "invsize");
int ob_sizei_location = GPU_shader_get_uniform(shader, "ob_sizei"); 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); GPU_shader_bind(shader);

4
source/blender/gpu/shaders/gpu_shader_smoke_vert.glsl
View File

@ -1,12 +1,12 @@
varying vec3 coords; varying vec3 coords;
uniform vec3 min; uniform vec3 min_location;
uniform vec3 invsize; uniform vec3 invsize;
uniform vec3 ob_sizei; uniform vec3 ob_sizei;
void main() void main()
{ {
gl_Position = gl_ModelViewProjectionMatrix * vec4(gl_Vertex.xyz * ob_sizei, 1.0); 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;
} }