diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-09-22 04:44:06 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-09-22 04:44:06 +0300 |
| commit | 225e52eaf89039dccf66a4f503fdb7007b1a0394 (patch) | |
| tree | cbd8ecbff238a01ca152e2d96c82640339c5f267 /source/blender/draw/modes | |
| parent | 56fd75c85654815feab03aa8bde46df7cd491130 (diff) | |
Edit Mesh Mode : Fix GLSL compilation errors
Diffstat (limited to 'source/blender/draw/modes')
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 19 | ||||
| -rw-r--r-- | source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 82fc89be098..7cff23a2d23 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -163,8 +163,8 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, - "#define ANTI_ALIASING" - "#define VERTEX_FACING"); + "#define ANTI_ALIASING\n" + "#define VERTEX_FACING\n"); } if (!e_data.overlay_tri_vcol_sh) { e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib( @@ -175,7 +175,7 @@ static void EDIT_MESH_engine_init(void *vedata) "#define EDGE_FIX\n" "#define VERTEX_SELECTION\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING"); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_tri_vcol_fast_sh) { e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib( @@ -185,7 +185,7 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING"); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_edge_sh) { e_data.overlay_edge_sh = DRW_shader_create_with_lib( @@ -193,8 +193,8 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, - "#define ANTI_ALIASING" - "#define VERTEX_FACING"); + "#define ANTI_ALIASING\n" + "#define VERTEX_FACING\n"); } if (!e_data.overlay_edge_vcol_sh) { e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib( @@ -203,22 +203,21 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" - "#define VERTEX_FACING"); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_vert_sh) { e_data.overlay_vert_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_loosevert_vert_glsl, NULL, datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, - "#define VERTEX_SELECTION\n" - "#define VERTEX_FACING"); + "#define VERTEX_SELECTION\n"); } if (!e_data.overlay_facedot_sh) { e_data.overlay_facedot_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_facedot_vert_glsl, NULL, datatoc_edit_mesh_overlay_facedot_frag_glsl, datatoc_common_globals_lib_glsl, - "#define VERTEX_FACING"); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_mix_sh) { e_data.overlay_mix_sh = DRW_shader_create_fullscreen(datatoc_edit_mesh_overlay_mix_frag_glsl, NULL); diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl index 9df20ff7544..ed7421c1b1d 100644 --- a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl +++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl @@ -164,7 +164,7 @@ void main() large_edge_color = (edgesBweight[v] > 0.0) ? vec4(colorEdgeBWeight.rgb, edgesBweight[v]) : large_edge_color; large_edge_color = ((flag[v] & EDGE_SEAM) != 0) ? colorEdgeSeam : large_edge_color; - if (large_edge_color != 0.0) { + if (large_edge_color.a != 0.0) { colorDistEdge(large_edge_color, largeEdge); } |