Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-20 16:08:45 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-20 17:23:22 +0300
commitf1ab36d15455e18d328923d7aedfa1472842cb98 (patch)
tree6d8c42c015843817ff507bfa21dbab08dc4bcb7d /source/blender/editors/space_outliner
parente243f366c66bc74a3b74d14b3b1eb18bbc39e1d1 (diff)
Fix outliner crash loading some .blend files without treestore.
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c2
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 55a437d6ad5..91033189035 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1945,7 +1945,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, Spa
else
soops->search_flags &= ~SO_SEARCH_RECURSIVE;
- if (soops->treehash && (soops->storeflag & SO_TREESTORE_REBUILD)) {
+ if (soops->treehash && (soops->storeflag & SO_TREESTORE_REBUILD) && soops->treestore) {
soops->storeflag &= ~SO_TREESTORE_REBUILD;
BKE_outliner_treehash_rebuild_from_treestore(soops->treehash, soops->treestore);
}