blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix possible null-pointer dereference in new Outliner tree building code

This commit is contained in:
Julian Eisel 2020-11-07 01:23:36 +01:00
parent dc9a52a303
commit 5fb67573b5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2322,9 +2322,11 @@ void outliner_build_tree(Main *mainvar,
space_outliner->runtime->tree_view = outliner_tree_view_create(space_outliner->outlinevis,
space_outliner);
TreeSourceData source_data = {.bmain = mainvar, .scene = scene, .view_layer = view_layer};
space_outliner->tree = outliner_tree_view_build_tree(space_outliner->runtime->tree_view,
&source_data);
if (space_outliner->runtime->tree_view) {
TreeSourceData source_data = {.bmain = mainvar, .scene = scene, .view_layer = view_layer};
space_outliner->tree = outliner_tree_view_build_tree(space_outliner->runtime->tree_view,
&source_data);
}
if (!BLI_listbase_is_empty(&space_outliner->tree)) {
/* Skip. */