diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-05-15 16:52:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-05-15 20:29:18 +0300 |
| commit | 2d479421af7ea75d7f005aabaa909880043dbace (patch) | |
| tree | 37a14bbc2c1c46d0d6f80c500da96cd8e4a9b5f8 /source/blender/editors/space_outliner/outliner_tree.c | |
| parent | 5dc22fbbfbed0e825faa8faab8bc5f32a6fdd829 (diff) | |
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!
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 728a7501d5b..d4bef06cca9 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -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); } |