blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Nathan Craddock 2020-11-02 22:59:00 -07:00
parent fbf2908674 20e982e78d
commit 093dfdfc94
Notes: blender-bot 2023-02-14 02:43:21 +01:00 
Referenced by issue #82360, Crash after linked object is edited then switched to another scene (object origin scene)
Referenced by issue #82355, Wacom problem on 2.92 since the 1 november build
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1557,7 +1557,7 @@ static void outliner_add_layer_collection_objects(SpaceOutliner *space_outliner,
TreeElement *te_object = outliner_add_element(space_outliner, tree, base->object, ten, 0, 0);
te_object->directdata = base;
if (!(base->flag & BASE_VISIBLE_DEPSGRAPH)) {
if (!(base->flag & BASE_VISIBLE_VIEWLAYER)) {
te_object->flag |= TE_DISABLED;
}
}