Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2022-07-20 18:13:15 +0300
committerJulian Eisel <julian@blender.org>2022-07-20 18:16:15 +0300
commitc4d8e28aa7043d7b7774d5b88ef454ba4d3e81ce (patch)
tree05c03edd3d32386c3dc5e58dd47e85d813501b35 /source
parent0c6ae51d9f043c0914d68d36b221d91285a2da11 (diff)
UI: Remove redundant view reference in view items
The new view item base class already holds a reference to the view, no need to have one in the derived class as well.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/include/UI_grid_view.hh2
-rw-r--r--source/blender/editors/interface/views/grid_view.cc4
2 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/include/UI_grid_view.hh b/source/blender/editors/include/UI_grid_view.hh
index 805198f38ef..402c0c8512f 100644
--- a/source/blender/editors/include/UI_grid_view.hh
+++ b/source/blender/editors/include/UI_grid_view.hh
@@ -36,8 +36,6 @@ class AbstractGridViewItem : public AbstractViewItem {
friend class AbstractGridView;
friend class GridViewLayoutBuilder;
- const AbstractGridView *view_;
-
protected:
/** Reference to a string that uniquely identifies this item in the view. */
StringRef identifier_{};
diff --git a/source/blender/editors/interface/views/grid_view.cc b/source/blender/editors/interface/views/grid_view.cc
index 54ed3fe1631..52ff1460cbd 100644
--- a/source/blender/editors/interface/views/grid_view.cc
+++ b/source/blender/editors/interface/views/grid_view.cc
@@ -29,8 +29,6 @@ AbstractGridViewItem &AbstractGridView::add_item(std::unique_ptr<AbstractGridVie
items_.append(std::move(item));
AbstractGridViewItem &added_item = *items_.last();
- added_item.view_ = this;
-
item_map_.add(added_item.identifier_, &added_item);
register_item(added_item);
@@ -181,7 +179,7 @@ const AbstractGridView &AbstractGridViewItem::get_view() const
throw std::runtime_error(
"Invalid state, item must be added through AbstractGridView::add_item()");
}
- return *view_;
+ return dynamic_cast<AbstractGridView &>(*view_);
}
/* ---------------------------------------------------------------------- */