[Bf-blender-cvs] [24049c8] master: readfile: add assert to check libmap isn't sorted
Campbell Barton
noreply at git.blender.org
Mon Jun 6 11:10:55 CEST 2016
Commit: 24049c8196ccb88eadc5930e780151c1c0da6a27
Author: Campbell Barton
Date: Mon Jun 6 19:09:46 2016 +1000
Branches: master
https://developer.blender.org/rB24049c8196ccb88eadc5930e780151c1c0da6a27
readfile: add assert to check libmap isn't sorted
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index df36def..96a9c44 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -222,7 +222,7 @@ typedef struct OldNew {
typedef struct OldNewMap {
OldNew *entries;
int nentries, entriessize;
- int sorted;
+ bool sorted;
int lasthit;
} OldNewMap;
@@ -288,6 +288,7 @@ static int verg_oldnewmap(const void *v1, const void *v2)
static void oldnewmap_sort(FileData *fd)
{
+ BLI_assert(fd->libmap->sorted == false);
qsort(fd->libmap->entries, fd->libmap->nentries, sizeof(OldNew), verg_oldnewmap);
fd->libmap->sorted = 1;
}
@@ -1509,6 +1510,9 @@ static void change_idid_adr_fd(FileData *fd, const void *old, void *new)
{
int i;
+ /* use a binary search if we have a sorted libmap, for now it's not needed. */
+ BLI_assert(fd->libmap->sorted == false);
+
for (i = 0; i < fd->libmap->nentries; i++) {
OldNew *entry = &fd->libmap->entries[i];
More information about the Bf-blender-cvs
mailing list