tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.1-release'

This commit is contained in:
Julian Eisel 2024-03-18 19:37:56 +01:00
parent 8945b29762 745fd2a2cb
commit 0d7ac2542e
7 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc
View File

@ -66,8 +66,7 @@ class AssetCatalogSelectorTree : public ui::AbstractTreeView {
catalog_tree_.foreach_root_item(
[this](const asset_system::AssetCatalogTreeItem &catalog_item) {
Item &item = build_catalog_items_recursive(*this, catalog_item);
/* Uncollapse root items by default (user edits will override this just fine). */
item.set_collapsed(false);
item.uncollapse_by_default();
});
}

7
source/blender/editors/include/UI_tree_view.hh
View File

@ -213,6 +213,13 @@ class AbstractTreeViewItem : public AbstractViewItem, public TreeViewItemContain
* \returns true when the collapsed state was changed, false otherwise.
*/
virtual bool set_collapsed(bool collapsed);
/**
* Make this item be uncollapsed on first draw (may later be overriden by
* #should_be_collapsed()). Must only be done during tree building.
*
* \note this does not call #on_collapse_change() or #set_collapsed() overrides.
*/
void uncollapse_by_default();
/**
* Requires the tree to have completed reconstruction, see #is_reconstructed(). Otherwise we

4
source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc
View File

@ -394,12 +394,12 @@ void LayerTreeView::build_tree_node_recursive(TreeViewOrItem &parent, TreeNode &
if (node.is_layer()) {
LayerViewItem &item = parent.add_tree_item<LayerViewItem>(this->grease_pencil_,
node.as_layer());
item.set_collapsed(false);
item.uncollapse_by_default();
}
else if (node.is_group()) {
LayerGroupViewItem &group_item = parent.add_tree_item<LayerGroupViewItem>(this->grease_pencil_,
node.as_group());
group_item.set_collapsed(false);
group_item.uncollapse_by_default();
LISTBASE_FOREACH_BACKWARD (GreasePencilLayerTreeNode *, node_, &node.as_group().children) {
build_tree_node_recursive(group_item, node_->wrap());
}

4
source/blender/editors/interface/interface_template_node_tree_interface.cc
View File

@ -266,7 +266,7 @@ class NodeTreeInterfaceView : public AbstractTreeView {
item);
NodeSocketViewItem &socket_item = parent_item.add_tree_item<NodeSocketViewItem>(
nodetree_, interface_, *socket);
socket_item.set_collapsed(false);
socket_item.uncollapse_by_default();
break;
}
case NODE_INTERFACE_PANEL: {
@ -274,7 +274,7 @@ class NodeTreeInterfaceView : public AbstractTreeView {
item);
NodePanelViewItem &panel_item = parent_item.add_tree_item<NodePanelViewItem>(
nodetree_, interface_, *panel);
panel_item.set_collapsed(false);
panel_item.uncollapse_by_default();
add_items_for_panel_recursive(*panel, panel_item);
break;
}

13
source/blender/editors/interface/views/tree_view.cc
View File

@ -523,10 +523,19 @@ bool AbstractTreeViewItem::set_collapsed(const bool collapsed)
return true;
}
void AbstractTreeViewItem::uncollapse_by_default()
{
BLI_assert_msg(this->get_tree_view().is_reconstructed() == false,
"Default state should only be set while building the tree");
BLI_assert(this->supports_collapsing());
/* Set the open state. Note that this may be overridden later by #should_be_collapsed(). */
is_open_ = true;
}
bool AbstractTreeViewItem::is_collapsible() const
{
// BLI_assert_msg(get_tree_view().is_reconstructed(),
// "State can't be queried until reconstruction is completed");
BLI_assert_msg(get_tree_view().is_reconstructed(),
"State can't be queried until reconstruction is completed");
if (children_.is_empty()) {
return false;
}

2
source/blender/editors/space_file/asset_catalog_tree_view.cc
View File

@ -193,7 +193,7 @@ AssetCatalogTreeView::AssetCatalogTreeView(asset_system::AssetLibrary *library,
void AssetCatalogTreeView::build_tree()
{
AssetCatalogTreeViewAllItem &all_item = add_all_item();
all_item.set_collapsed(false);
all_item.uncollapse_by_default();
if (catalog_tree_) {
/* Pass the "All" item on as parent of the actual catalog items. */

5
source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc
View File

@ -91,6 +91,7 @@ class GeometryDataSetTreeView : public ui::AbstractTreeView {
bke::GeometryComponent::Type::GreasePencil,
IFACE_("Grease Pencil"),
ICON_OUTLINER_DATA_GREASEPENCIL);
grease_pencil.uncollapse_by_default();
GeometryDataSetTreeViewItem &grease_pencil_layers =
grease_pencil.add_tree_item<GeometryDataSetTreeViewItem>(
bke::GeometryComponent::Type::GreasePencil,
@ -126,6 +127,7 @@ class GeometryDataSetTreeView : public ui::AbstractTreeView {
{
GeometryDataSetTreeViewItem &mesh = this->add_tree_item<GeometryDataSetTreeViewItem>(
bke::GeometryComponent::Type::Mesh, IFACE_("Mesh"), ICON_MESH_DATA);
mesh.uncollapse_by_default();
mesh.add_tree_item<GeometryDataSetTreeViewItem>(bke::GeometryComponent::Type::Mesh,
bke::AttrDomain::Point,
IFACE_("Vertex"),
@ -141,6 +143,7 @@ class GeometryDataSetTreeView : public ui::AbstractTreeView {
GeometryDataSetTreeViewItem &curve = this->add_tree_item<GeometryDataSetTreeViewItem>(
bke::GeometryComponent::Type::Curve, IFACE_("Curve"), ICON_CURVE_DATA);
curve.uncollapse_by_default();
curve.add_tree_item<GeometryDataSetTreeViewItem>(bke::GeometryComponent::Type::Curve,
bke::AttrDomain::Point,
IFACE_("Control Point"),
@ -154,6 +157,7 @@ class GeometryDataSetTreeView : public ui::AbstractTreeView {
GeometryDataSetTreeViewItem &pointcloud = this->add_tree_item<GeometryDataSetTreeViewItem>(
bke::GeometryComponent::Type::PointCloud, IFACE_("Point Cloud"), ICON_POINTCLOUD_DATA);
pointcloud.uncollapse_by_default();
pointcloud.add_tree_item<GeometryDataSetTreeViewItem>(bke::GeometryComponent::Type::PointCloud,
bke::AttrDomain::Point,
IFACE_("Point"),
@ -174,7 +178,6 @@ GeometryDataSetTreeViewItem::GeometryDataSetTreeViewItem(
: component_type_(component_type), domain_(std::nullopt), icon_(icon)
{
label_ = label;
this->set_collapsed(false);
}
GeometryDataSetTreeViewItem::GeometryDataSetTreeViewItem(
bke::GeometryComponent::Type component_type, int layer_index, StringRef label, BIFIconID icon)