[Bf-blender-cvs] [cf91fb347d5] blender-v2.92-release: Fix T85178: edit-mesh show_edges overlay option toggles face-dots

Campbell Barton noreply at git.blender.org
Fri Jan 29 12:30:31 CET 2021


Commit: cf91fb347d5385d814bc731fa148f5a9d8d01964
Author: Campbell Barton
Date:   Fri Jan 29 22:08:22 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rBcf91fb347d5385d814bc731fa148f5a9d8d01964

Fix T85178: edit-mesh show_edges overlay option toggles face-dots

When this behavior was added it made sense,
since then show_edges has changed to make edge-display more subtle
(see 1a4b60c30db319b71bdc2e2fed2612c873fa8757) instead of removing
edge-selection display entirely.

===================================================================

M	source/blender/draw/engines/overlay/overlay_edit_mesh.c

===================================================================

diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.c b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
index 728b3d510fa..38e171cb5e2 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_mesh.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
@@ -110,12 +110,6 @@ void OVERLAY_edit_mesh_cache_init(OVERLAY_Data *vedata)
   float face_alpha = (do_occlude_wire || !pd->edit_mesh.do_faces) ? 0.0f : 1.0f;
   GPUTexture **depth_tex = (pd->edit_mesh.do_zbufclip) ? &dtxl->depth : &txl->dummy_depth_tx;
 
-  if (select_face && !pd->edit_mesh.do_faces && pd->edit_mesh.do_edges) {
-    /* Force display of face centers in this case because that's
-     * the only way to see if a face is selected. */
-    show_face_dots = true;
-  }
-
   /* Run Twice for in-front passes. */
   for (int i = 0; i < 2; i++) {
     /* Complementary Depth Pass */



More information about the Bf-blender-cvs mailing list