Commit: 84c464a4b85d4f6f71d33f9a0a3a41b1d046fe60
Author: Campbell Barton
Date: Thu Apr 20 21:12:56 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB84c464a4b85d4f6f71d33f9a0a3a41b1d046fe60
Use theme vertex size for lattice & curve vertices
===================================================================
M source/blender/draw/modes/edit_curve_mode.c
M source/blender/draw/modes/edit_lattice_mode.c
M source/blender/draw/modes/shaders/edit_curve_overlay_loosevert_vert.glsl
M
source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl
===================================================================
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
