Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2fdbcca3c - Show all commits

2
source/blender/editors/space_outliner/outliner_select.cc
View File

@ -219,7 +219,7 @@ void outliner_item_mode_toggle(bContext *C,
static void tree_element_viewlayer_activate(bContext *C, TreeElement *te) static void tree_element_viewlayer_activate(bContext *C, TreeElement *te)
{ {
/* paranoia check */ /* paranoia check */
if (te->idcode != ID_SCE) { if (te->store_elem->type != TSE_R_LAYER) {
return; return;
} }

10
source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
View File

@ -79,8 +79,14 @@ ListBase TreeDisplayViewLayer::buildTree(const TreeSourceData &source_data)
} }
else { else {
TreeElement &te_view_layer = *outliner_add_element( TreeElement &te_view_layer = *outliner_add_element(
&space_outliner_, &tree, scene, nullptr, TSE_R_LAYER, 0); &space_outliner_, &tree, view_layer, nullptr, TSE_R_LAYER, 0);
TREESTORE(&te_view_layer)->flag &= ~TSE_CLOSED;
TreeStoreElem *tselem = TREESTORE(&te_view_layer);
if (!tselem->used) {
tselem->flag &= ~TSE_CLOSED;
}
te_view_layer.name = view_layer->name; te_view_layer.name = view_layer->name;
te_view_layer.directdata = view_layer; te_view_layer.directdata = view_layer;