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/alembic | |
| 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/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_writer_curves.cc | 6 | ||||
| -rw-r--r-- | source/blender/alembic/intern/abc_writer_mball.cc | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/alembic/intern/abc_writer_curves.cc b/source/blender/alembic/intern/abc_writer_curves.cc index 3ab9b365a72..bb9109dc025 100644 --- a/source/blender/alembic/intern/abc_writer_curves.cc +++ b/source/blender/alembic/intern/abc_writer_curves.cc @@ -31,7 +31,6 @@ extern "C" { #include "BKE_curve.h" #include "BKE_mesh.h" -#include "BKE_object.h" } using Alembic::AbcGeom::OCompoundProperty; @@ -177,11 +176,10 @@ Mesh *AbcCurveMeshWriter::getEvaluatedMesh(Scene * /*scene_eval*/, Object *ob_eval, bool &r_needsfree) { - Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); - if (mesh_eval != NULL) { + if (ob_eval->runtime.mesh_eval != NULL) { /* Mesh_eval only exists when generative modifiers are in use. */ r_needsfree = false; - return mesh_eval; + return ob_eval->runtime.mesh_eval; } r_needsfree = true; diff --git a/source/blender/alembic/intern/abc_writer_mball.cc b/source/blender/alembic/intern/abc_writer_mball.cc index cc0775bd537..aa08146c6e2 100644 --- a/source/blender/alembic/intern/abc_writer_mball.cc +++ b/source/blender/alembic/intern/abc_writer_mball.cc @@ -30,7 +30,6 @@ extern "C" { #include "BKE_lib_id.h" #include "BKE_mball.h" #include "BKE_mesh.h" -#include "BKE_object.h" #include "BLI_utildefines.h" } @@ -56,11 +55,10 @@ bool AbcMBallWriter::isAnimated() const Mesh *AbcMBallWriter::getEvaluatedMesh(Scene * /*scene_eval*/, Object *ob_eval, bool &r_needsfree) { - Mesh *mesh_eval = BKE_object_get_evaluated_mesh(ob_eval); - if (mesh_eval != NULL) { + if (ob_eval->runtime.mesh_eval != NULL) { /* Mesh_eval only exists when generative modifiers are in use. */ r_needsfree = false; - return mesh_eval; + return ob_eval->runtime.mesh_eval; } r_needsfree = true; |