Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergej Reich <sergej.reich@googlemail.com>2013-01-26 21:38:45 +0400
committerSergej Reich <sergej.reich@googlemail.com>2013-01-26 21:38:45 +0400
commitc84383301c5a2582e95259a7e4468a23a3566401 (patch)
tree1dd1df9d9cfb2cf5714f5ed5762f2cb5e2d56160 /source/blender/makesrna
parent7e49a39acda5cdc86ce87470f7dc10cd80f1eba7 (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/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 705ac09382d..7304f7c9a49 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -406,7 +406,8 @@ static void rna_Scene_object_unlink(Scene *scene, ReportList *reports, Object *o
scene->basact = NULL;
}
- BKE_scene_base_remove(scene, base);
+ BKE_scene_base_unlink(scene, base);
+ MEM_freeN(base);
ob->id.us--;