[Bf-blender-cvs] [219e6a98c66] master: Fix show face-dot check
Campbell Barton
noreply at git.blender.org
Tue May 28 03:48:47 CEST 2019
Commit: 219e6a98c66a00673395d5c420ff35ad86eef846
Author: Campbell Barton
Date: Tue May 28 11:46:26 2019 +1000
Branches: master
https://developer.blender.org/rB219e6a98c66a00673395d5c420ff35ad86eef846
Fix show face-dot check
Match edit-mesh drawing.
===================================================================
M source/blender/editors/mesh/editmesh_select.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index e8116309010..6a91fcb8327 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -228,13 +228,14 @@ struct EDBMSelectID_Context {
static bool check_ob_drawface_dot(short select_mode, const View3D *v3d, char dt)
{
if (select_mode & SCE_SELECT_FACE) {
- if (dt < OB_SOLID) {
+ if ((dt < OB_SOLID) || XRAY_FLAG_ENABLED(v3d)) {
return true;
}
if (v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FACE_DOT) {
return true;
}
- if (XRAY_FLAG_ENABLED(v3d)) {
+ if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_EDGES) == 0) {
+ /* Since we can't deduce face selection when edges aren't visible - show dots. */
return true;
}
}
More information about the Bf-blender-cvs
mailing list