Merge branch 'blender-v2.83-release'

This commit is contained in:
Bastien Montagne 2020-05-12 16:16:30 +02:00
commit 25c67a65d6
1 changed files with 5 additions and 0 deletions

View File

@ -346,6 +346,11 @@ static void scene_free_data(ID *id)
}
if (scene->rigidbody_world) {
/* Prevent rigidbody freeing code to follow other IDs pointers, this should never be allowed
* nor necessary from here, and with new undo code, those pointers may be fully invalid or
* worse, pointing to data actually belonging to new BMain! */
scene->rigidbody_world->constraints = NULL;
scene->rigidbody_world->group = NULL;
BKE_rigidbody_free_world(scene);
}