diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-01-26 21:38:45 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-01-26 21:38:45 +0400 |
| commit | c84383301c5a2582e95259a7e4468a23a3566401 (patch) | |
| tree | 1dd1df9d9cfb2cf5714f5ed5762f2cb5e2d56160 /source/blender/editors/object/object_relations.c | |
| parent | 7e49a39acda5cdc86ce87470f7dc10cd80f1eba7 (diff) | |
Fix [#34005] blender will close immediately in debug mode on deleting objects
Was silly mistake from rigidbody merge, base was used after it's been
freed.
Now don't free base in BKE_scene_base_remove() and rename it to
BKE_scene_base_unlink().
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 68d7dcafd9c..9749494bc66 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -354,7 +354,8 @@ static int make_proxy_exec(bContext *C, wmOperator *op) /* remove base, leave user count of object, it gets linked in BKE_object_make_proxy */ if (gob == NULL) { - BKE_scene_base_remove(scene, oldbase); + BKE_scene_base_unlink(scene, oldbase); + MEM_freeN(oldbase); } BKE_object_make_proxy(newob, ob, gob); |