diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-19 15:57:07 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-19 16:40:25 +0300 |
| commit | 96e6fd3b607ced947b593f7f0f3133a917d6d113 (patch) | |
| tree | 7bfe8b12ec89764325c3c4ea5cc9d7793453e672 /source/blender/blenkernel/intern/scene.c | |
| parent | ab1beb9744254475a4b19d4648af2bb438f70ae9 (diff) | |
Remove rigid body from rbw->group when deleting
I moved some code from ED_rigidbody_object_remove() to
BKE_rigidbody_remove_object(), so that calling the latter doesn't leave
the object in rbw->group (causing a crash later on when rebuilding the
depsgraph).
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 509db2b5b37..b1a0bde9746 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1185,14 +1185,14 @@ char *BKE_scene_find_last_marker_name(Scene *scene, int frame) return best_marker ? best_marker->name : NULL; } -void BKE_scene_remove_rigidbody_object(Scene *scene, Object *ob) +void BKE_scene_remove_rigidbody_object(struct Main *bmain, Scene *scene, Object *ob) { /* remove rigid body constraint from world before removing object */ if (ob->rigidbody_constraint) BKE_rigidbody_remove_constraint(scene, ob); /* remove rigid body object from world before removing object */ if (ob->rigidbody_object) - BKE_rigidbody_remove_object(scene, ob); + BKE_rigidbody_remove_object(bmain, scene, ob); } /* checks for cycle, returns 1 if it's all OK */ |