blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Outliner: postpone rebuilding the tree 

On existing Blender could rebuild tree many times (on freeing each ID).
Use a flag instead of immediately rebuilding.
This commit is contained in:
Campbell Barton 2015-05-11 11:06:35 +10:00
parent f4bae1f6d6
commit 3141870c96
Notes: blender-bot 2023-02-14 09:08:32 +01:00 
Referenced by issue #44671, Volume Scatter Output color is inverted
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/readfile.c
View File

@ -6051,7 +6051,7 @@ static void lib_link_screen(FileData *fd, Main *main)
}
if (so->treehash) {
/* rebuild hash table, because it depends on ids too */
BKE_outliner_treehash_rebuild_from_treestore(so->treehash, so->treestore);
so->storeflag |= SO_TREESTORE_REBUILD;
}
}
}
@ -6405,7 +6405,7 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
}
if (so->treehash) {
/* rebuild hash table, because it depends on ids too */
BKE_outliner_treehash_rebuild_from_treestore(so->treehash, so->treestore);
so->storeflag |= SO_TREESTORE_REBUILD;
}
}
}

3
source/blender/editors/space_outliner/outliner_edit.c
View File

@ -1984,7 +1984,8 @@ void ED_outliner_id_unref(SpaceOops *so, const ID *id)
}
if (so->treehash && changed) {
/* rebuild hash table, because it depends on ids too */
BKE_outliner_treehash_rebuild_from_treestore(so->treehash, so->treestore);
/* postpone a full rebuild because this can be called many times on-free */
so->storeflag |= SO_TREESTORE_REBUILD;
}
}
}

5
source/blender/editors/space_outliner/outliner_tree.c
View File

@ -1580,6 +1580,11 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
else
soops->search_flags &= ~SO_SEARCH_RECURSIVE;
if (soops->storeflag & SO_TREESTORE_REBUILD) {
soops->storeflag &= ~SO_TREESTORE_REBUILD;
BKE_outliner_treehash_rebuild_from_treestore(soops->treehash, soops->treestore);
}
if (soops->tree.first && (soops->storeflag & SO_TREESTORE_REDRAW))
return;

5
source/blender/makesdna/DNA_space_types.h
View File

@ -290,10 +290,13 @@ typedef enum eSpaceOutliner_Mode {
/* SpaceOops->storeflag */
typedef enum eSpaceOutliner_StoreFlag {
/* rebuild tree */
/* cleanup tree */
SO_TREESTORE_CLEANUP = (1 << 0),
/* if set, it allows redraws. gets set for some allqueue events */
SO_TREESTORE_REDRAW = (1 << 1),
/* rebuild the tree, similar to cleanup,
* but defer a call to BKE_outliner_treehash_rebuild_from_treestore instead */
SO_TREESTORE_REBUILD = (1 << 2),
} eSpaceOutliner_StoreFlag;
/* outliner search flags (SpaceOops->search_flags) */