[Bf-blender-cvs] [e98c83ed1b8] undo-experiments: Fix for recent merge.
Bastien Montagne
noreply at git.blender.org
Wed Feb 26 12:41:23 CET 2020
Commit: e98c83ed1b85adcc753ecb57b302314534384d37
Author: Bastien Montagne
Date: Wed Feb 26 12:21:23 2020 +0100
Branches: undo-experiments
https://developer.blender.org/rBe98c83ed1b85adcc753ecb57b302314534384d37
Fix for recent merge.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index bb4432de595..3970f4df4ef 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9165,8 +9165,7 @@ static BHead *read_libblock(FileData *fd,
/* At this point, we know we are going to keep that newly read & allocated ID, so we need to
* reallocate it to ensure we actually get a unique memory address for it. */
if (!BKE_main_idmemhash_register_id(main, NULL, id)) {
- id = BKE_main_idmemhash_unique_realloc(
- main, NULL, id, MEM_reallocN_id, MEM_allocN_len(id), __func__);
+ id = BKE_main_idmemhash_unique_realloc(main, NULL, id);
}
/* for ID_LINK_PLACEHOLDER check */
More information about the Bf-blender-cvs
mailing list