From f8553de2cdc66ca2744aebffe0f9d55b29787b92 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Fri, 27 Nov 2020 20:09:53 +0100 Subject: GPencil: Fix unreported vertex size for Bezier handles By error, the Bezier points were using the mesh vertex size, not the grease pencil vertex size. --- .../draw/engines/overlay/shaders/edit_curve_point_vert.glsl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl index 6b4edbfe578..64cc1b7d840 100644 --- a/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl @@ -18,21 +18,22 @@ void main() GPU_INTEL_VERTEX_SHADER_WORKAROUND /* Reuse the FREESTYLE flag to determine is GPencil. */ + bool is_gpencil = ((data & EDGE_FREESTYLE) != 0); if ((data & VERT_SELECTED) != 0) { if ((data & VERT_ACTIVE) != 0) { finalColor = colorEditMeshActive; } else { - finalColor = ((data & EDGE_FREESTYLE) == 0) ? colorVertexSelect : colorGpencilVertexSelect; + finalColor = (!is_gpencil) ? colorVertexSelect : colorGpencilVertexSelect; } } else { - finalColor = ((data & EDGE_FREESTYLE) == 0) ? colorVertex : colorGpencilVertex; + finalColor = (!is_gpencil) ? colorVertex : colorGpencilVertex; } vec3 world_pos = point_object_to_world(pos); gl_Position = point_world_to_ndc(world_pos); - gl_PointSize = sizeVertex * 2.0; + gl_PointSize = (!is_gpencil) ? sizeVertex * 2.0 : sizeVertexGpencil * 2.0; #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); #endif -- cgit v1.2.3