[Bf-blender-cvs] [e4a13e4] master: Fix memory leak of main lock when reading from library files.

Antony Riakiotakis noreply at git.blender.org
Mon Aug 4 16:01:58 CEST 2014


Commit: e4a13e40eb39cb35934132ffd9183869a8d8abc5
Author: Antony Riakiotakis
Date:   Mon Aug 4 16:00:57 2014 +0200
Branches: master
https://developer.blender.org/rBe4a13e40eb39cb35934132ffd9183869a8d8abc5

Fix memory leak of main lock when reading from library files.

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d5eebdb..7b2aaad 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);
 	}
 }




More information about the Bf-blender-cvs mailing list