diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-02-28 14:59:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-28 15:01:02 +0300 |
| commit | da1140f75e08ac5228474e5cdbb995ec7c0df579 (patch) | |
| tree | 0603441863f1ec4537d363217c29be745848b386 /source/blender/editors/transform/transform_snap_object.c | |
| parent | 7a8a074a30b045eafbef6eeb5293f1e76a3cb5a7 (diff) | |
Revert "Objects: make evaluated data runtime storage usable for types other than mesh"
This reverts commit f2b95b9eae2ee913c99cff7595527b18d8b49d0a.
Fix T74283: modifier display lost when moving object in edit mode.
The cause is not immediately obvious so better to revert and look at this
carefully.
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index ecd267d6f2a..2ad3de1528f 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -936,13 +936,12 @@ static bool raycastObj(SnapObjectContext *sctx, case OB_CURVE: case OB_SURF: case OB_FONT: { - Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob); - if (mesh_eval) { + if (ob->runtime.mesh_eval) { retval = raycastMesh(sctx, ray_start, ray_dir, ob, - mesh_eval, + ob->runtime.mesh_eval, obmat, ob_index, false, @@ -2655,12 +2654,11 @@ static short snapObject(SnapObjectContext *sctx, break; /* Use ATTR_FALLTHROUGH if we want to snap to the generated mesh. */ case OB_SURF: case OB_FONT: { - Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob); - if (mesh_eval) { + if (ob->runtime.mesh_eval) { retval |= snapMesh(sctx, snapdata, ob, - mesh_eval, + ob->runtime.mesh_eval, obmat, use_backface_culling, dist_px, |