diff options
| author | Brecht Van Lommel <brecht> | 2020-02-27 13:23:15 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-27 17:25:35 +0300 |
| commit | f2b95b9eae2ee913c99cff7595527b18d8b49d0a (patch) | |
| tree | 4bbd1a009cd5ace8bd9bb3efe8e5882a459b5f98 /source/blender/editors/transform/transform_snap_object.c | |
| parent | 57b7833d1eff5e11bbdec654ff09fb24263cc055 (diff) | |
Objects: make evaluated data runtime storage usable for types other than mesh
This is in preparation of new object types. This only changes mesh_eval, we
may do the same for mesh_deform_eval and other areas in the future if there is
a need for it.
Differential Revision: https://developer.blender.org/D6695
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, 6 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 2ad3de1528f..ecd267d6f2a 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -936,12 +936,13 @@ static bool raycastObj(SnapObjectContext *sctx, case OB_CURVE: case OB_SURF: case OB_FONT: { - if (ob->runtime.mesh_eval) { + Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob); + if (mesh_eval) { retval = raycastMesh(sctx, ray_start, ray_dir, ob, - ob->runtime.mesh_eval, + mesh_eval, obmat, ob_index, false, @@ -2654,11 +2655,12 @@ static short snapObject(SnapObjectContext *sctx, break; /* Use ATTR_FALLTHROUGH if we want to snap to the generated mesh. */ case OB_SURF: case OB_FONT: { - if (ob->runtime.mesh_eval) { + Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob); + if (mesh_eval) { retval |= snapMesh(sctx, snapdata, ob, - ob->runtime.mesh_eval, + mesh_eval, obmat, use_backface_culling, dist_px, |