Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-02-28 14:59:18 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-02-28 15:01:02 +0300
commitda1140f75e08ac5228474e5cdbb995ec7c0df579 (patch)
tree0603441863f1ec4537d363217c29be745848b386 /source/blender/blenkernel/intern/rigidbody.c
parent7a8a074a30b045eafbef6eeb5293f1e76a3cb5a7 (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/blenkernel/intern/rigidbody.c')
-rw-r--r--source/blender/blenkernel/intern/rigidbody.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 494c5e21613..c2180e50b74 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -332,24 +332,22 @@ void BKE_rigidbody_object_copy(Main *bmain, Object *ob_dst, const Object *ob_src
/* get the appropriate evaluated mesh based on rigid body mesh source */
static Mesh *rigidbody_get_mesh(Object *ob)
{
- BLI_assert(ob->type == OB_MESH);
-
switch (ob->rigidbody_object->mesh_source) {
case RBO_MESH_DEFORM:
return ob->runtime.mesh_deform_eval;
case RBO_MESH_FINAL:
- return BKE_object_get_evaluated_mesh(ob);
+ return ob->runtime.mesh_eval;
case RBO_MESH_BASE:
/* This mesh may be used for computing looptris, which should be done
* on the original; otherwise every time the CoW is recreated it will
* have to be recomputed. */
BLI_assert(ob->rigidbody_object->mesh_source == RBO_MESH_BASE);
- return (Mesh *)ob->runtime.data_orig;
+ return ob->runtime.mesh_orig;
}
/* Just return something sensible so that at least Blender won't crash. */
BLI_assert(!"Unknown mesh source");
- return BKE_object_get_evaluated_mesh(ob);
+ return ob->runtime.mesh_eval;
}
/* create collision shape of mesh - convex hull */