[Bf-blender-cvs] [098008f42d8] master: Fix T77295: Snapping in edit mode only works for non-selected polys/verts/edges

Germano Cavalcante noreply at git.blender.org
Sat Jun 13 03:07:45 CEST 2020


Commit: 098008f42d8127d9b60717c7059d3c55a3bfada7
Author: Germano Cavalcante
Date:   Fri Jun 12 22:07:27 2020 -0300
Branches: master
https://developer.blender.org/rB098008f42d8127d9b60717c7059d3c55a3bfada7

Fix T77295: Snapping in edit mode only works for non-selected polys/verts/edges

Caused by the optimization of `Skip EditMesh to Mesh Conversion`.

Now that EditMesh is used when the Mesh has no modifiers, do not
skip the selected elements.

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

M	source/blender/editors/transform/transform_snap.c

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

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index c6d7b92fb42..4f942221f79 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -634,12 +634,15 @@ static void initSnappingMode(TransInfo *t)
       t->tsnap.object_context = ED_transform_snap_object_context_create_view3d(
           t->scene, 0, t->region, t->view);
 
-      ED_transform_snap_object_context_set_editmesh_callbacks(
-          t->tsnap.object_context,
-          (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled,
-          bm_edge_is_snap_target,
-          bm_face_is_snap_target,
-          POINTER_FROM_UINT((BM_ELEM_SELECT | BM_ELEM_HIDDEN)));
+      if (t->data_type == TC_MESH_VERTS) {
+        /* Ignore elements being transformed. */
+        ED_transform_snap_object_context_set_editmesh_callbacks(
+            t->tsnap.object_context,
+            (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled,
+            bm_edge_is_snap_target,
+            bm_face_is_snap_target,
+            POINTER_FROM_UINT((BM_ELEM_SELECT | BM_ELEM_HIDDEN)));
+      }
     }
   }
 }



More information about the Bf-blender-cvs mailing list