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 | |
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')
-rw-r--r-- | source/blender/editors/mesh/editface.c | 7 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_knife_project.c | 5 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 3 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/info_stats.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 10 |
7 files changed, 18 insertions, 23 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); diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 49b6acc9003..92e76ab31fa 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -488,8 +488,7 @@ static void PE_set_view3d_data(bContext *C, PEData *data) static bool PE_create_shape_tree(PEData *data, Object *shapeob) { - Object *shapeob_eval = DEG_get_evaluated_object(data->depsgraph, shapeob); - Mesh *mesh = BKE_object_get_evaluated_mesh(shapeob_eval); + Mesh *mesh = BKE_object_get_evaluated_mesh(data->depsgraph, shapeob); memset(&data->shape_bvh, 0, sizeof(data->shape_bvh)); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 6971182e5b8..7372ea6d44a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -181,7 +181,7 @@ static MDeformVert *defweight_prev_init(MDeformVert *dvert_prev, * (without evaluating modifiers) */ static bool vertex_paint_use_fast_update_check(Object *ob) { - Mesh *me_eval = BKE_object_get_evaluated_mesh(ob); + Mesh *me_eval = ob->runtime.mesh_eval; if (me_eval != NULL) { Mesh *me = BKE_mesh_from_object(ob); diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index d00083d343b..225ca72a7d0 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -137,7 +137,7 @@ static void stats_object(Object *ob, SceneStats *stats, GSet *objects_gset) switch (ob->type) { case OB_MESH: { /* we assume evaluated mesh is already built, this strictly does stats now. */ - Mesh *me_eval = BKE_object_get_evaluated_mesh(ob); + Mesh *me_eval = ob->runtime.mesh_eval; if (!BLI_gset_add(objects_gset, me_eval)) { break; } @@ -153,7 +153,8 @@ static void stats_object(Object *ob, SceneStats *stats, GSet *objects_gset) case OB_SURF: case OB_CURVE: case OB_FONT: { - Mesh *me_eval = BKE_object_get_evaluated_mesh(ob); + Mesh *me_eval = ob->runtime.mesh_eval; + if ((me_eval != NULL) && !BLI_gset_add(objects_gset, me_eval)) { break; } 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; } } 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, |