griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Edit Mesh Mode: Put AntiAliasing #define into shader include header.

Browse Source
This commit is contained in:
Clément Foucault
2017-09-22 02:44:15 +02:00
parent 1a4a1447b7
commit 56fd75c856
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/modes/edit_mesh_mode.c
View File

@@ -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) {

2
source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
View File

@@ -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)
{