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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-28 04:46:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-28 04:46:26 +0300
commit219e6a98c66a00673395d5c420ff35ad86eef846 (patch)
tree6c8cc8845b9c72f4732afd33b17b749af3f835d7 /source
parentc7160053229cec67e72e1ecfce6539ecc04d5c68 (diff)
Fix show face-dot check
Match edit-mesh drawing.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/mesh/editmesh_select.c5
1 files changed, 3 insertions, 2 deletions
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;
}
}