diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-03-01 16:07:04 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-03-02 03:08:32 +0300 |
| commit | 26fc6c71c411e9ba3650a8f5dbb16167a528f984 (patch) | |
| tree | 5d202037a5832e5531512ec2dbba2cbc477c84f7 /source/blender/gpu/intern/gpu_shader.c | |
| parent | 3baa18672490a028b5d9af081d78f9cc0d80128e (diff) | |
Edit Mode overlays: separate multiple shaders for loose edges and verts
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 4bfae6523a9..c633fd0835e 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -110,7 +110,9 @@ extern char datatoc_gpu_shader_edges_overlay_geom_glsl[]; extern char datatoc_gpu_shader_edges_overlay_simple_geom_glsl[]; extern char datatoc_gpu_shader_edges_overlay_frag_glsl[]; extern char datatoc_gpu_shader_edit_overlay_frag_glsl[]; -extern char datatoc_gpu_shader_edit_overlay_geom_glsl[]; +extern char datatoc_gpu_shader_edit_overlay_geom_tri_glsl[]; +extern char datatoc_gpu_shader_edit_overlay_geom_edge_glsl[]; +extern char datatoc_gpu_shader_edit_overlay_geom_vert_glsl[]; extern char datatoc_gpu_shader_edit_overlay_vert_glsl[]; extern char datatoc_gpu_shader_text_vert_glsl[]; extern char datatoc_gpu_shader_text_frag_glsl[]; @@ -670,9 +672,15 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader) datatoc_gpu_shader_flat_color_frag_glsl }, [GPU_SHADER_EDGES_OVERLAY_SIMPLE] = { datatoc_gpu_shader_3D_vert_glsl, datatoc_gpu_shader_edges_overlay_frag_glsl, datatoc_gpu_shader_edges_overlay_simple_geom_glsl }, - [GPU_SHADER_EDGES_OVERLAY_EDIT] = { datatoc_gpu_shader_edit_overlay_vert_glsl, - datatoc_gpu_shader_edit_overlay_frag_glsl, - datatoc_gpu_shader_edit_overlay_geom_glsl }, + [GPU_SHADER_EDGES_OVERLAY_EDIT_TRI] = { datatoc_gpu_shader_edit_overlay_vert_glsl, + datatoc_gpu_shader_edit_overlay_frag_glsl, + datatoc_gpu_shader_edit_overlay_geom_tri_glsl }, + [GPU_SHADER_EDGES_OVERLAY_EDIT_EDGE] = { datatoc_gpu_shader_edit_overlay_vert_glsl, + datatoc_gpu_shader_edit_overlay_frag_glsl, + datatoc_gpu_shader_edit_overlay_geom_edge_glsl }, + [GPU_SHADER_EDGES_OVERLAY_EDIT_VERT] = { datatoc_gpu_shader_edit_overlay_vert_glsl, + datatoc_gpu_shader_edit_overlay_frag_glsl, + datatoc_gpu_shader_edit_overlay_geom_vert_glsl }, [GPU_SHADER_EDGES_OVERLAY] = { datatoc_gpu_shader_edges_overlay_vert_glsl, datatoc_gpu_shader_edges_overlay_frag_glsl, datatoc_gpu_shader_edges_overlay_geom_glsl }, |