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:
authorAntony Riakiotakis <kalast@gmail.com>2014-08-04 18:00:57 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-08-04 18:01:48 +0400
commite4a13e40eb39cb35934132ffd9183869a8d8abc5 (patch)
tree898d0dde99d3d74a4368cdfaaba224577026fe75
parent6ba4db29062a1d3aaa6e18de776a1fd761a1dcb0 (diff)
Fix memory leak of main lock when reading from library files.
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d5eebdb12d2..7b2aaade713 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -434,8 +434,7 @@ void blo_join_main(ListBase *mainlist)
while ((tojoin = mainl->next)) {
add_main_to_main(mainl, tojoin);
BLI_remlink(mainlist, tojoin);
- MEM_freeN(tojoin->eval_ctx);
- MEM_freeN(tojoin);
+ BKE_main_free(tojoin);
}
}