Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-06-14 09:51:42 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-14 15:18:52 +0300
commit277d90127417881a13be6b8c8db46fb4339391e9 (patch)
treecb77c17d0a29b0f46cee4fffc702ffe0559aabe3 /source/blender/draw/modes/edit_mesh_mode.c
parent158930228d6b4a62e74d836803793ff5b1a309d7 (diff)
T55456 EditMeshMode
- see the face selection color when face is active - test different masks for active face, finally chosen for no mask at all.
Diffstat (limited to 'source/blender/draw/modes/edit_mesh_mode.c')
-rw-r--r--source/blender/draw/modes/edit_mesh_mode.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 5be98b12bb7..d51f3a85105 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -156,29 +156,29 @@ static char *EDIT_MESH_sh_defines(ToolSettings *tsettings, RegionView3D *rv3d, b
if (selectmode & SCE_SELECT_VERTEX)
{
- BLI_dynstr_appendf(ds, "#define VERTEX_SELECTION\n");
+ BLI_dynstr_append(ds, "#define VERTEX_SELECTION\n");
}
if (selectmode & SCE_SELECT_EDGE)
{
- BLI_dynstr_appendf(ds, "#define EDGE_SELECTION\n");
+ BLI_dynstr_append(ds, "#define EDGE_SELECTION\n");
}
if (selectmode & SCE_SELECT_FACE)
{
- BLI_dynstr_appendf(ds, "#define FACE_SELECTION\n");
+ BLI_dynstr_append(ds, "#define FACE_SELECTION\n");
}
if (!fast_mode)
{
- BLI_dynstr_appendf(ds, "#define EDGE_FIX\n");
+ BLI_dynstr_append(ds, "#define EDGE_FIX\n");
}
if (anti_alias)
{
- BLI_dynstr_appendf(ds, "#define ANTI_ALIASING\n");
+ BLI_dynstr_append(ds, "#define ANTI_ALIASING\n");
}
- BLI_dynstr_appendf(ds, "#define VERTEX_FACING\n");
+ BLI_dynstr_append(ds, "#define VERTEX_FACING\n");
str = BLI_dynstr_get_cstring(ds);
BLI_dynstr_free(ds);
@@ -213,7 +213,6 @@ static GPUShader *EDIT_MESH_ensure_shader(ToolSettings *tsettings, RegionView3D
datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl,
defines);
-
MEM_freeN(defines);
}
return e_data.overlay_tri_sh_cache[index];