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/space_view3d/drawobject.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/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 00f61a4d0aa..0daa5aa53ae 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -28,9 +28,9 @@ #include "BLI_math.h" #include "BKE_DerivedMesh.h" -#include "BKE_editmesh.h" #include "BKE_global.h" -#include "BKE_object.h" + +#include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -120,9 +120,8 @@ void ED_draw_object_facemap(Depsgraph *depsgraph, Mesh *me = ob->data; { Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); - Mesh *me_eval = BKE_object_get_evaluated_mesh(ob_eval); - if (me_eval != NULL) { - me = me_eval; + if (ob_eval->runtime.mesh_eval) { + me = ob_eval->runtime.mesh_eval; } } |