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

Make use of new 'idtype can use idtype' check (in ID usages code, and ID remapping one too).

Browse Source 
Reduces calls to BKE_library_foreach_ID_link() from 312 to 105 when relocating a library in a
rather simple lib reload test...
This commit is contained in:
Bastien Montagne
2016-07-07 21:18:04 +02:00
parent e2d469f878
commit 3fb2c1e4a2
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/library_query.c
View File

@@ -960,14 +960,19 @@ static bool library_ID_is_used(Main *bmain, void *idv, const bool check_linked)
{
IDUsersIter iter;
ListBase *lb_array[MAX_LIBARRAY];
ID *id = idv;
int i = set_listbasepointers(bmain, lb_array);
bool is_defined = false;
iter.id = idv;
iter.id = id;
iter.count = 0;
while (i-- && !is_defined) {
ID *id_curr = lb_array[i]->first;
if (!id_curr || !BKE_library_idtype_can_use_idtype(GS(id->name), GS(id_curr->name))) {
continue;
}
for (; id_curr && !is_defined; id_curr = id_curr->next) {
if (check_linked != ID_IS_LINKED_DATABLOCK(id_curr)) {
continue;
@@ -1007,14 +1012,19 @@ void BKE_library_ID_test_usages(Main *bmain, void *idv, bool *is_used_local, boo
{
IDUsersIter iter_local, iter_linked;
ListBase *lb_array[MAX_LIBARRAY];
ID *id = idv;
int i = set_listbasepointers(bmain, lb_array);
bool is_defined = false;
iter_local.id = iter_linked.id = idv;
iter_local.id = iter_linked.id = id;
iter_local.count = iter_linked.count = 0;
while (i-- && !is_defined) {
ID *id_curr = lb_array[i]->first;
if (!id_curr || !BKE_library_idtype_can_use_idtype(GS(id->name), GS(id_curr->name))) {
continue;
}
for (; id_curr && !is_defined; id_curr = id_curr->next) {
IDUsersIter *iter = (ID_IS_LINKED_DATABLOCK(id_curr)) ? &iter_linked : &iter_local;