Use pointers to actual data for particle uniforms

This makes particle color uniforms point directly to material color, and
particle size uniforms point directly to ParticleSettings size.

4 files changed, 21 insertions, 14 deletions

diff --git a/source/blender/draw/modes/shaders/object_particle_dot_frag.glsl b/source/blender/draw/modes/shaders/object_particle_dot_frag.glsl
index eae5ee633ae..044a949ef98 100644
--- a/source/blender/draw/modes/shaders/object_particle_dot_frag.glsl
+++ b/source/blender/draw/modes/shaders/object_particle_dot_frag.glsl
@@ -1,6 +1,6 @@
 
-uniform vec4 color;
-uniform vec4 outlineColor;
+uniform vec3 color;
+uniform vec3 outlineColor;
 
 in vec4 radii;
 out vec4 fragColor;
@@ -23,11 +23,12 @@ void main() {
 	float midStroke = 0.5 * (radii[1] + radii[2]);
 
 	if (dist > midStroke) {
-		fragColor.rgb = outlineColor.rgb;
-		fragColor.a = mix(outlineColor.a, 0.0, smoothstep(radii[1], radii[0], dist));
+		fragColor.rgb = outlineColor;
+		fragColor.a = mix(1.0, 0.0, smoothstep(radii[1], radii[0], dist));
 	}
 	else {
-		fragColor = mix(color, outlineColor, smoothstep(radii[3], radii[2], dist));
+		fragColor.rgb = mix(color, outlineColor, smoothstep(radii[3], radii[2], dist));
+		fragColor.a = 1.0;
 	}
 
 	if (fragColor.a == 0.0) {
diff --git a/source/blender/draw/modes/shaders/object_particle_dot_vert.glsl b/source/blender/draw/modes/shaders/object_particle_dot_vert.glsl
index d9d30c8e677..36b665173f1 100644
--- a/source/blender/draw/modes/shaders/object_particle_dot_vert.glsl
+++ b/source/blender/draw/modes/shaders/object_particle_dot_vert.glsl
@@ -1,6 +1,6 @@
 
 uniform mat4 ModelViewProjectionMatrix;
-uniform float size;
+uniform int size;
 
 in vec3 pos;
 out vec4 radii;
diff --git a/source/blender/draw/modes/shaders/object_particle_prim_frag.glsl b/source/blender/draw/modes/shaders/object_particle_prim_frag.glsl
index 50572f293d9..791d38390a2 100644
--- a/source/blender/draw/modes/shaders/object_particle_prim_frag.glsl
+++ b/source/blender/draw/modes/shaders/object_particle_prim_frag.glsl
@@ -1,5 +1,5 @@
 
-uniform vec4 color;
+uniform vec3 color;
 
 flat in int finalAxis;
 
@@ -8,12 +8,12 @@ out vec4 fragColor;
 void main()
 {
 	if (finalAxis == -1) {
-		fragColor = color;
+		fragColor.rgb = color;
 	}
 	else {
-		vec4 col = vec4(0.0);
-		col[finalAxis] = 1.0;
-		col.a = 1.0;
-		fragColor = col;
+		fragColor.rgb = vec3(0.0);
+		fragColor[finalAxis] = 1.0;
 	}
+
+	fragColor.a = 1.0;
 }
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 2483ca5b2d2..ff16f61b884 100644
--- a/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl
+++ b/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl
@@ -5,7 +5,7 @@ uniform mat4 ModelViewMatrix;
 uniform mat4 ProjectionMatrix;
 uniform int screen_space;
 uniform float pixel_size;
-uniform float draw_size;
+uniform int draw_size;
 
 in vec3 pos;
 in vec4 rot;
@@ -36,7 +36,13 @@ void main()
 		gl_Position = ProjectionMatrix * gl_Position;
 	}
 	else {
-		gl_Position = ModelViewProjectionMatrix * vec4(pos + rotate(inst_pos * pix_size * draw_size, rot), 1.0);
+		int size = draw_size;
+
+		if (axis > -1) {
+			size *= 2;
+		}
+
+		gl_Position = ModelViewProjectionMatrix * vec4(pos + rotate(inst_pos * pix_size * size, rot), 1.0);
 	}
 
 	finalAxis = axis;