diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-09-22 03:44:15 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-09-22 03:44:40 +0300 |
| commit | 56fd75c85654815feab03aa8bde46df7cd491130 (patch) | |
| tree | f299885a43d9fa334ee26f6cfd89c9b68245abdc /source/blender/draw/modes | |
| parent | 1a4a1447b728082939e7b0f033602f27c0269937 (diff) | |
Edit Mesh Mode: Put AntiAliasing #define into shader include header.
Diffstat (limited to 'source/blender/draw/modes')
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 5 | ||||
| -rw-r--r-- | source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index c723d6e2d2d..82fc89be098 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -154,6 +154,7 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" + "#define ANTI_ALIASING\n" "#define VERTEX_FACING"); } if (!e_data.overlay_tri_fast_sh) { @@ -162,6 +163,7 @@ 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"); } if (!e_data.overlay_tri_vcol_sh) { @@ -172,6 +174,7 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" "#define VERTEX_SELECTION\n" + "#define ANTI_ALIASING\n" "#define VERTEX_FACING"); } if (!e_data.overlay_tri_vcol_fast_sh) { @@ -181,6 +184,7 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" + "#define ANTI_ALIASING\n" "#define VERTEX_FACING"); } if (!e_data.overlay_edge_sh) { @@ -189,6 +193,7 @@ 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"); } if (!e_data.overlay_edge_vcol_sh) { 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 d7f96695d0e..9df20ff7544 100644 --- a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl +++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl @@ -91,8 +91,6 @@ float distToEdge(vec2 o, vec2 dir) return sqrt(abs(dot(af, af) - daf * daf)); } -#define ANTI_ALIASING - #ifdef ANTI_ALIASING void colorDistEdge(vec4 color, float dist) { |