diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-10-17 23:31:59 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-10-17 23:31:59 +0400 |
commit | 27a662f670a8f06a554c32c51f3d4b4884f64848 (patch) | |
tree | 54f286323c4425cffe6c70e50cc7e27d49a1a4a1 /source/blender | |
parent | cb9439fc2f4514e6296d7c58133f0119e21a10b7 (diff) |
Missing ParticleSystem->parent pointer check in BKE_object_unlink.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 94744866a17..d277d25294e 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -590,6 +590,9 @@ void BKE_object_unlink(Object *ob) } } } + + if (tpsys->parent == ob) + tpsys->parent = NULL; } if (ob->pd) DAG_id_tag_update(&obt->id, OB_RECALC_DATA); |