Commit: 97f6dc3d10f61315d8475a29e933e9ec88b092e2
Author: Martin Felke
Date: Mon May 23 10:30:56 2016 +0200
Branches: fracture_modifier
https://developer.blender.org/rB97f6dc3d10f61315d8475a29e933e9ec88b092e2
backport for missing smoke viewport display due to using "min" as variable name
This was a fix for T47991 and affects OSX only.
===================================================================
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
