tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix crasher in new lazy-rebuild outliner's treehash. 

treehash must always been checked before used!

Reported on irc by sebastian_k and investigated by sergey, thanks!
This commit is contained in:
Bastien Montagne 2015-05-15 15:52:24 +02:00
parent 5dc22fbbfb
commit 2d479421af
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/outliner_treehash.c
View File

@ -102,6 +102,9 @@ static void fill_treehash(void *treehash, BLI_mempool *treestore)
TreeStoreElem *tselem;
BLI_mempool_iter iter;
BLI_mempool_iternew(treestore, &iter);
BLI_assert(treehash);
while ((tselem = BLI_mempool_iterstep(&iter))) {
BKE_outliner_treehash_add_element(treehash, tselem);
}
@ -121,6 +124,8 @@ static void free_treehash_group(void *key)
void *BKE_outliner_treehash_rebuild_from_treestore(void *treehash, BLI_mempool *treestore)
{
BLI_assert(treehash);
BLI_ghash_clear_ex(treehash, NULL, free_treehash_group, BLI_mempool_count(treestore));
fill_treehash(treehash, treestore);
return treehash;
@ -144,12 +149,19 @@ static TseGroup *BKE_outliner_treehash_lookup_group(GHash *th, short type, short
tse_template.type = type;
tse_template.nr = type ? nr : 0; // we're picky! :)
tse_template.id = id;
BLI_assert(th);
return BLI_ghash_lookup(th, &tse_template);
}
TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash, short type, short nr, struct ID *id)
{
TseGroup *group = BKE_outliner_treehash_lookup_group(treehash, type, nr, id);
TseGroup *group;
BLI_assert(treehash);
group = BKE_outliner_treehash_lookup_group(treehash, type, nr, id);
if (group) {
int i;
for (i = 0; i < group->size; i++) {
@ -163,11 +175,17 @@ TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash, short type, s
TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash, short type, short nr, struct ID *id)
{
TseGroup *group = BKE_outliner_treehash_lookup_group(treehash, type, nr, id);
TseGroup *group;
BLI_assert(treehash);
group = BKE_outliner_treehash_lookup_group(treehash, type, nr, id);
return group ? group->elems[0] : NULL;
}
void BKE_outliner_treehash_free(void *treehash)
{
BLI_assert(treehash);
BLI_ghash_free(treehash, NULL, free_treehash_group);
}

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

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