diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-15 17:37:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-15 17:37:10 +0300 |
| commit | 60c5b3f76fe7c7027b7637f9d53e657ffd6d0402 (patch) | |
| tree | 518bd0c91c832889bb4ca42f3c0833fd90a4611b /source/blender/blenkernel/intern/blendfile.c | |
| parent | a35e733ff18fcdf5b57937cd85f9bcd6aec236b0 (diff) | |
| parent | 3d03616772b760f968bd4d4791c6073817c10586 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 111dc98476f..53f2462ee98 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -430,9 +430,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); } |