diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-20 14:12:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-20 14:16:37 +0300 |
commit | 84c464a4b85d4f6f71d33f9a0a3a41b1d046fe60 (patch) | |
tree | 565f6bb7a7d94786a6a7c52d07a4ea4fa42e55e1 /source/blender/draw | |
parent | 3d17ece53924aae7289d279bf139ca444dd5bf82 (diff) |
Use theme vertex size for lattice & curve vertices
Diffstat (limited to 'source/blender/draw')
4 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index f32c90c5a11..5f12bfeec73 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -199,8 +199,7 @@ static void EDIT_CURVE_cache_init(void *vedata) psl->overlay_vert_pass = DRW_pass_create( "Curve Vert Overlay", - DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH); - + DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_POINT); stl->g_data->overlay_vert_shgrp = DRW_shgroup_create(e_data.overlay_vert_sh, psl->overlay_vert_pass); } diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index a73b49108bd..1c986ea1936 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -171,13 +171,11 @@ static void EDIT_LATTICE_cache_init(void *vedata) psl->wire_pass = DRW_pass_create( "Lattice Wire", DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_WIRE); - stl->g_data->wire_shgrp = DRW_shgroup_create(e_data.wire_sh, psl->wire_pass); psl->vert_pass = DRW_pass_create( "Lattice Verts", - DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH); - + DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_POINT); stl->g_data->vert_shgrp = DRW_shgroup_create(e_data.overlay_vert_sh, psl->vert_pass); } } diff --git a/source/blender/draw/modes/shaders/edit_curve_overlay_loosevert_vert.glsl b/source/blender/draw/modes/shaders/edit_curve_overlay_loosevert_vert.glsl index 1af529e5482..8b6c29e719b 100644 --- a/source/blender/draw/modes/shaders/edit_curve_overlay_loosevert_vert.glsl +++ b/source/blender/draw/modes/shaders/edit_curve_overlay_loosevert_vert.glsl @@ -34,6 +34,6 @@ void main() vertFlag = data; - gl_PointSize = sizeEdgeFix; gl_Position = pPos; + gl_PointSize = sizeVertex; } diff --git a/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl b/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl index d3fc56d1ee9..b273601c176 100644 --- a/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl +++ b/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl @@ -34,6 +34,6 @@ void main() vertFlag = data; - gl_PointSize = sizeEdgeFix; + gl_PointSize = sizeVertex; gl_Position = pPos; } |