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:
authorClément Foucault <foucault.clem@gmail.com>2019-05-24 21:11:06 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-05-24 21:21:55 +0300
commit203f9a49e29c82458a49efe856eb58f938eb537b (patch)
tree9b2fd6a87efd3a68ce2b665976cbadd7c4abf766 /source/blender/draw/modes/edit_mesh_mode.c
parent76019139f620a41839860e27abf9f02f9a7bc28b (diff)
Edit Mesh: Change color behavior
- Make edges darker in vert & face select mode (making more contrast to not loose the topology). Downside is less select edges visibility in vertex mode. But I'm confident that it's not as painfull as it seems. - Make select faces less saturated to have more color contrast between select faces and edges. - Make unselected faces white to increase contrast with faces and edges. The brightening is negligeable for bright surfaces and help readability on darker surfaces. Reminder that if the faces overlays are too distracting (i.e: uv mapping, or texturing) they can be toggled off in the overlay panel. Reviewers: billreynish, campbellbarton, brecht Reviewed By: billreynish, campbellbarton, brecht Subscribers: brecht Differential Revision: https://developer.blender.org/D4941
Diffstat (limited to 'source/blender/draw/modes/edit_mesh_mode.c')
-rw-r--r--source/blender/draw/modes/edit_mesh_mode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 2b17dd43ee5..b02625db3b6 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -373,9 +373,8 @@ static DRWPass *edit_mesh_create_overlay_pass(float *face_alpha,
DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
DRW_shgroup_uniform_vec2(grp, "viewportSizeInv", DRW_viewport_invert_size_get(), 1);
DRW_shgroup_uniform_ivec4(grp, "dataMask", data_mask, 1);
- DRW_shgroup_uniform_bool_copy(grp, "doEdges", do_edges);
DRW_shgroup_uniform_float_copy(grp, "ofs", depth_ofs);
- DRW_shgroup_uniform_bool_copy(grp, "selectEdges", select_edge);
+ DRW_shgroup_uniform_bool_copy(grp, "selectEdges", do_edges || select_edge);
DRW_shgroup_state_enable(grp, DRW_STATE_OFFSET_NEGATIVE);
/* To match blender loop structure. */
@@ -455,7 +454,6 @@ static void EDIT_MESH_cache_init(void *vedata)
}
if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_EDGES) == 0) {
if ((tsettings->selectmode & SCE_SELECT_EDGE) == 0) {
- stl->g_data->data_mask[1] &= ~(VFLAG_EDGE_ACTIVE & VFLAG_EDGE_SELECTED);
stl->g_data->do_edges = false;
}
}