From b68b26c265d0984da08773196c0d673881fd6c13 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 15 Aug 2017 17:52:58 +0200 Subject: Attempt to fix GLSL errors on Blender startup. I couldn't reproduce either, but calling min() with different argument data types and indexing vectors with an index not known at compile time seem likely to cause problems. Ref T52404, T52404. --- .../draw/modes/shaders/object_particle_prim_vert.glsl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source/blender/draw/modes/shaders/object_particle_prim_vert.glsl') diff --git a/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl b/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl index a950a9b86ba..54ae319307a 100644 --- a/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl +++ b/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl @@ -39,16 +39,18 @@ void main() } #ifdef USE_AXIS - finalColor.rgb = vec3(0.0); - finalColor[axis] = 1.0; + if (axis == 0) + finalColor = vec4(1.0, 0.0, 0.0, 1.0); + else if (axis == 1) + finalColor = vec4(0.0, 1.0, 0.0, 1.0); + else + finalColor = vec4(0.0, 0.0, 1.0, 1.0); #else if (val < 0.0) { - finalColor.rgb = color; + finalColor = vec4(color, 1.0); } else { - finalColor.rgb = texture(ramp, val).rgb; + finalColor = vec4(texture(ramp, val).rgb, 1.0); } #endif - - finalColor.a = 1.0; } -- cgit v1.2.3