From 2d479421af7ea75d7f005aabaa909880043dbace Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 15 May 2015 15:52:24 +0200 Subject: 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! --- source/blender/editors/space_outliner/outliner_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_outliner/outliner_tree.c') 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); } -- cgit v1.2.3