archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Undo System: id-map avoid duplicate add/lookup

Browse Source 
Add versions of add/lookup that check the previous item.
This commit is contained in:
Campbell Barton
2018-04-03 16:46:11 +02:00
parent 53f068454e
commit 75de21f072
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_undo_system.h
View File

@@ -180,7 +180,15 @@ struct UndoIDPtrMap *BKE_undosys_ID_map_create(void);
void BKE_undosys_ID_map_destroy(struct UndoIDPtrMap *map);
void BKE_undosys_ID_map_add(struct UndoIDPtrMap *map, ID *id);
struct ID *BKE_undosys_ID_map_lookup(const struct UndoIDPtrMap *map, const struct ID *id_src);
void BKE_undosys_ID_map_foreach_ID_ref(
void BKE_undosys_ID_map_add_with_prev(
struct UndoIDPtrMap *map, struct ID *id,
struct ID **id_prev);
struct ID *BKE_undosys_ID_map_lookup_with_prev(
const struct UndoIDPtrMap *map, struct ID *id_src,
struct ID *id_prev_match[2]);
void BKE_undosys_ID_map_foreach_ID_ref(
struct UndoIDPtrMap *map,
UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data);

23
source/blender/blenkernel/intern/undo_system.c
View File

@@ -776,6 +776,7 @@ void BKE_undosys_ID_map_add(UndoIDPtrMap *map, ID *id)
map->pmap[len_src].index = len_src;
map->len = len_dst;
/* TODO(campbell): use binary search result and memmove instread of full-sort. */
qsort(map->pmap, map->len, sizeof(*map->pmap), BLI_sortutil_cmp_ptr);
}
@@ -792,4 +793,26 @@ ID *BKE_undosys_ID_map_lookup(const UndoIDPtrMap *map, const ID *id_src)
return id_dst;
}
void BKE_undosys_ID_map_add_with_prev(UndoIDPtrMap *map, ID *id, ID **id_prev)
{
if (id == *id_prev) {
return;
}
*id_prev = id;
BKE_undosys_ID_map_add(map, id);
}
ID *BKE_undosys_ID_map_lookup_with_prev(const UndoIDPtrMap *map, ID *id_src, ID *id_prev_match[2])
{
if (id_src == id_prev_match[0]) {
return id_prev_match[1];
}
else {
ID *id_dst = BKE_undosys_ID_map_lookup(map, id_src);
id_prev_match[0] = id_src;
id_prev_match[1] = id_dst;
return id_dst;
}
}
/** \} */