Fix error when filtering in Outliner "Blender File" mode with libraries
Steps to reproduce were:
* Load factory settings
* Link any library
* Change to "Blender File" display mode in Outliner
* Enable filtering
* -> Assert fails
This may have had further side-effects for linked IDs.
Checked with Bastien, the NULL-check seems reasonable. It was initially there
but removed in d74f9c4b7b
.
Fine to backport.
This commit is contained in:
parent
2036b9771e
commit
2a72421cfb
Notes:
blender-bot
2023-02-14 06:25:25 +01:00
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
|
@ -2356,8 +2356,10 @@ void outliner_build_tree(
|
|||
|
||||
for (lib = mainvar->libraries.first; lib; lib = lib->id.next) {
|
||||
ten = outliner_add_library_contents(mainvar, soops, &soops->tree, lib);
|
||||
BLI_assert(ten != NULL);
|
||||
lib->id.newid = (ID *)ten;
|
||||
/* NULL-check matters, due to filtering there may not be a new element. */
|
||||
if (ten) {
|
||||
lib->id.newid = (ID *)ten;
|
||||
}
|
||||
}
|
||||
/* make hierarchy */
|
||||
ten = soops->tree.first;
|
||||
|
|
Loading…
Reference in New Issue