Object Engine: Ported Force Field object drawing.

2 files changed, 9 insertions, 2 deletions

diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl
index a39bfde41ee..2ee74b3eae0 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl
@@ -14,16 +14,19 @@ flat out vec4 finalColor;
 
 void main()
 {
-	vec3 offset;
+	vec3 offset = vec3(0.0);
 
+#ifdef AXIS_NAME
 	if (pos.z == 0.0)
 		offset = vec3(1.125, 0.0, 0.0);
 	else if (pos.z == 1.0)
 		offset = vec3(0.0, 1.125, 0.0);
 	else
 		offset = vec3(0.0, 0.0, 1.125);
+	offset *= size;
+#endif
 
 	vec3 screen_pos = screen_vecs[0].xyz * pos.x + screen_vecs[1].xyz * pos.y;
-	gl_Position = ViewProjectionMatrix * (InstanceModelMatrix * vec4(offset * size, 1.0) + vec4(screen_pos * size, 0.0));
+	gl_Position = ViewProjectionMatrix * (InstanceModelMatrix * vec4(offset, 1.0) + vec4(screen_pos * size, 0.0));
 	finalColor = vec4(color, 1.0);
 }
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
index 9ade68644fe..10a2ba61a2c 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
@@ -7,7 +7,11 @@ in vec3 pos;
 /* ---- Per instance Attribs ---- */
 in mat4 InstanceModelMatrix;
 in vec3 color;
+#ifdef UNIFORM_SCALE
 in float size;
+#else
+in vec3 size;
+#endif
 
 flat out vec4 finalColor;