main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit ac2f67dda0 - Show all commits

View File

@ -50,10 +50,11 @@ static void viewer_path_for_geometry_node(const SpaceNode &snode,
modifier = nmd; modifier = nmd;
} }
} }
if (modifier != nullptr) {
ModifierViewerPathElem *modifier_elem = BKE_viewer_path_elem_new_modifier(); ModifierViewerPathElem *modifier_elem = BKE_viewer_path_elem_new_modifier();
modifier_elem->modifier_name = BLI_strdup(modifier->modifier.name); modifier_elem->modifier_name = BLI_strdup(modifier->modifier.name);
BLI_addtail(&r_dst.path, modifier_elem); BLI_addtail(&r_dst.path, modifier_elem);
}
Vector<const bNodeTreePath *, 16> tree_path = snode.treepath; Vector<const bNodeTreePath *, 16> tree_path = snode.treepath;
for (const int i : tree_path.index_range().drop_back(1)) { for (const int i : tree_path.index_range().drop_back(1)) {