diff options
| author | Julian Eisel <julian@blender.org> | 2022-07-20 18:17:12 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-07-20 18:17:12 +0300 |
| commit | 85f0b2ef5d5bfb67c245da0a52aeec44e63445fa (patch) | |
| tree | 9ea058c2877c472aba82650e24e5927e3f03eded /source/blender/editors | |
| parent | bffc1fbf31f3b68fd83c5d5526ca7e3241eb9133 (diff) | |
| parent | c4d8e28aa7043d7b7774d5b88ef454ba4d3e81ce (diff) | |
Merge branch 'master' into asset-browser-grid-view
Diffstat (limited to 'source/blender/editors')
4 files changed, 5 insertions, 8 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 37fbb33f83b..52ff1460cbd 100644 --- a/source/blender/editors/interface/views/grid_view.cc +++ b/source/blender/editors/interface/views/grid_view.cc @@ -29,9 +29,8 @@ 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); return added_item; } @@ -180,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_); } /* ---------------------------------------------------------------------- */ diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index 2a87c51da5d..c7653e94b4d 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -412,7 +412,7 @@ GeometrySet spreadsheet_get_display_geometry_set(const SpaceSpreadsheet *sspread } else { if (object_eval->mode == OB_MODE_EDIT && object_eval->type == OB_MESH) { - Mesh *mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(object_eval, false); + Mesh *mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(object_eval); if (mesh == nullptr) { return geometry_set; } diff --git a/source/blender/editors/transform/transform_convert_mesh_edge.c b/source/blender/editors/transform/transform_convert_mesh_edge.c index 2d6c6a933d6..4a8ddb78587 100644 --- a/source/blender/editors/transform/transform_convert_mesh_edge.c +++ b/source/blender/editors/transform/transform_convert_mesh_edge.c @@ -99,8 +99,8 @@ void createTransEdge(TransInfo *t) td->ext = NULL; fl_ptr = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_float_offset); - td->val = fl_ptr; - td->ival = *fl_ptr; + td->loc = fl_ptr; + td->iloc[0] = *fl_ptr; td++; } |