[Bf-blender-cvs] [d5a42bce38f] blender2.8: RigidBody: use runtime.mesh_orig instead of DEG_get_original_object

Sybren A. Stüvel noreply at git.blender.org
Tue Jun 26 17:43:09 CEST 2018


Commit: d5a42bce38fd6548728b47a4ec76afdd75668341
Author: Sybren A. Stüvel
Date:   Mon Jun 25 16:35:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd5a42bce38fd6548728b47a4ec76afdd75668341

RigidBody: use runtime.mesh_orig instead of DEG_get_original_object

===================================================================

M	source/blender/blenkernel/intern/rigidbody.c

===================================================================

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 833ac0a88fa..03fa4ec3cf2 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -248,7 +248,7 @@ static Mesh *rigidbody_get_mesh(Object *ob)
 			 * 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 DEG_get_original_object(ob)->data;
+			return ob->runtime.mesh_orig;
 	}
 
 	/* Just return something sensible so that at least Blender won't crash. */



More information about the Bf-blender-cvs mailing list