diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-11-18 19:55:24 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-11-18 20:14:51 +0300 |
| commit | f61a73093ba5efcbcf60098c12acbff4b31d8b08 (patch) | |
| tree | bac83722f5fff31d324b0e24ce1d90c354fe54a9 /source/blender/editors/transform/transform_snap_object.c | |
| parent | ada6742601a715ee0d078cd693ba303a8286e1bd (diff) | |
Revert "Revert "Revert "Revert "Transform: interactive mode for editing a 'Snap Source'""""
This reverts commit 701f2dfd5bc61c0f37603880fa21abfe8b1d9620.
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 4b981e763f1..9f05a0a9562 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -391,9 +391,8 @@ static SnapObjectData *snap_object_data_editmesh_get(SnapObjectContext *sctx, } else if (sod->mesh_runtime) { if (sod->mesh_runtime != snap_object_data_editmesh_runtime_get(ob_eval)) { - if (G.moving) { + if (G.moving && !sod->treedata_editmesh.cached && !sod->cached[0] && !sod->cached[1]) { /* Hack to avoid updating while transforming. */ - BLI_assert(!sod->treedata_editmesh.cached && !sod->cached[0] && !sod->cached[1]); sod->mesh_runtime = snap_object_data_editmesh_runtime_get(ob_eval); } else { @@ -2830,6 +2829,15 @@ void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) MEM_freeN(sctx); } +static void transform_snap_object_context_cache_clear(SnapObjectContext *sctx) +{ + BLI_ghash_clear(sctx->cache.object_map, NULL, snap_object_data_free); + if (sctx->cache.data_to_object_map != NULL) { + BLI_ghash_clear(sctx->cache.data_to_object_map, NULL, NULL); + } + BLI_memarena_clear(sctx->cache.mem_arena); +} + void ED_transform_snap_object_context_set_editmesh_callbacks( SnapObjectContext *sctx, bool (*test_vert_fn)(BMVert *, void *user_data), @@ -2837,11 +2845,27 @@ void ED_transform_snap_object_context_set_editmesh_callbacks( bool (*test_face_fn)(BMFace *, void *user_data), void *user_data) { - sctx->callbacks.edit_mesh.test_vert_fn = test_vert_fn; - sctx->callbacks.edit_mesh.test_edge_fn = test_edge_fn; - sctx->callbacks.edit_mesh.test_face_fn = test_face_fn; + bool is_cache_dirty = false; + if (sctx->callbacks.edit_mesh.test_vert_fn != test_vert_fn) { + sctx->callbacks.edit_mesh.test_vert_fn = test_vert_fn; + is_cache_dirty = true; + } + if (sctx->callbacks.edit_mesh.test_edge_fn != test_edge_fn) { + sctx->callbacks.edit_mesh.test_edge_fn = test_edge_fn; + is_cache_dirty = true; + } + if (sctx->callbacks.edit_mesh.test_face_fn != test_face_fn) { + sctx->callbacks.edit_mesh.test_face_fn = test_face_fn; + is_cache_dirty = true; + } + if (sctx->callbacks.edit_mesh.user_data != user_data) { + sctx->callbacks.edit_mesh.user_data = user_data; + is_cache_dirty = true; + } - sctx->callbacks.edit_mesh.user_data = user_data; + if (is_cache_dirty) { + transform_snap_object_context_cache_clear(sctx); + } } bool ED_transform_snap_object_project_ray_ex(SnapObjectContext *sctx, |