diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-11-27 22:09:53 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-11-28 13:10:35 +0300 |
commit | f8553de2cdc66ca2744aebffe0f9d55b29787b92 (patch) | |
tree | 1cf3a357b534db8a73b91eeae42a446ff6eb276f /source/blender/draw | |
parent | fbdf1af3555027696df5b687c7fe8d345e4c39e9 (diff) |
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.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl | 7 |
1 files changed, 4 insertions, 3 deletions
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 |