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/mesh | |
| 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/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editface.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife_project.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5f948595a22..5c9fb866df7 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -35,7 +35,6 @@ #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_mesh.h" -#include "BKE_object.h" #include "ED_mesh.h" #include "ED_screen.h" @@ -81,8 +80,8 @@ void paintface_flush_flags(struct bContext *C, Object *ob, short flag) return; } - Mesh *me_orig = (Mesh *)ob_eval->runtime.data_orig; - Mesh *me_eval = (Mesh *)ob_eval->runtime.data_eval; + Mesh *me_orig = ob_eval->runtime.mesh_orig; + Mesh *me_eval = ob_eval->runtime.mesh_eval; bool updated = false; if (me_orig != NULL && me_eval != NULL && me_orig->totpoly == me->totpoly) { @@ -444,7 +443,7 @@ bool paintface_mouse_select( void paintvert_flush_flags(Object *ob) { Mesh *me = BKE_mesh_from_object(ob); - Mesh *me_eval = BKE_object_get_evaluated_mesh(ob); + Mesh *me_eval = ob->runtime.mesh_eval; MVert *mvert_eval, *mv; const int *index_array = NULL; int totvert; diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index 21de89d33dd..8d5c1469694 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -33,7 +33,6 @@ #include "BKE_curve.h" #include "BKE_editmesh.h" #include "BKE_mesh_runtime.h" -#include "BKE_object.h" #include "BKE_report.h" #include "DEG_depsgraph.h" @@ -62,9 +61,9 @@ static LinkNode *knifeproject_poly_from_object(const bContext *C, struct Mesh *me_eval; bool me_eval_needs_free; - if (ob->type == OB_MESH || ob->runtime.data_eval) { + if (ob->type == OB_MESH || ob->runtime.mesh_eval) { Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); - me_eval = BKE_object_get_evaluated_mesh(ob_eval); + me_eval = ob_eval->runtime.mesh_eval; if (me_eval == NULL) { Scene *scene_eval = (Scene *)DEG_get_evaluated_id(depsgraph, &scene->id); me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH); |