Merge branch 'blender-v2.90-release' into master
This commit is contained in:
commit
1ae9960a15
|
@ -251,6 +251,12 @@ static bNodeSocket *best_socket_output(bNodeTree *ntree,
|
|||
}
|
||||
}
|
||||
|
||||
/* Always allow linking to an reroute node. The socket type of the reroute sockets might change
|
||||
* after the link has been created. */
|
||||
if (node->type == NODE_REROUTE) {
|
||||
return node->outputs.first;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
@ -2461,7 +2461,9 @@ void outliner_build_tree(
|
|||
te_object->directdata = base;
|
||||
}
|
||||
|
||||
outliner_make_object_parent_hierarchy(&soops->tree);
|
||||
if ((soops->filter & SO_FILTER_NO_CHILDREN) == 0) {
|
||||
outliner_make_object_parent_hierarchy(&soops->tree);
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Show collections in the view layer. */
|
||||
|
|
Loading…
Reference in New Issue