[Bf-blender-cvs] [3d03616772b] master: Cleanup: do not use `BKE_libblock_free_ex()` unless needed!

Bastien Montagne noreply at git.blender.org
Thu Jun 15 16:36:35 CEST 2017


Commit: 3d03616772b760f968bd4d4791c6073817c10586
Author: Bastien Montagne
Date:   Thu Jun 15 16:20:51 2017 +0200
Branches: master
https://developer.blender.org/rB3d03616772b760f968bd4d4791c6073817c10586

Cleanup: do not use `BKE_libblock_free_ex()` unless needed!

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

M	source/blender/blenkernel/intern/blendfile.c

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

diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index a521d671ea4..05ea7983b8e 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -413,9 +413,9 @@ bool BKE_blendfile_read_from_memfile(
 	if (bfd) {
 		/* remove the unused screens and wm */
 		while (bfd->main->wm.first)
-			BKE_libblock_free_ex(bfd->main, bfd->main->wm.first, true, true);
+			BKE_libblock_free(bfd->main, bfd->main->wm.first);
 		while (bfd->main->screen.first)
-			BKE_libblock_free_ex(bfd->main, bfd->main->screen.first, true, true);
+			BKE_libblock_free(bfd->main, bfd->main->screen.first);
 
 		setup_app_data(C, bfd, "<memory1>", reports);
 	}




More information about the Bf-blender-cvs mailing list