From b5c2c3aba886f521a0cade5b8450683c20843d3a Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Thu, 1 Apr 2021 15:55:08 +0200 Subject: BLI: rename resource collector to resource scope Differential Revision: https://developer.blender.org/D10857 --- .../editors/space_spreadsheet/space_spreadsheet.cc | 10 +++++----- .../space_spreadsheet/spreadsheet_from_geometry.cc | 20 ++++++++++---------- .../space_spreadsheet/spreadsheet_from_geometry.hh | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source/blender/editors/space_spreadsheet') diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index 0f7709b464e..403e6cd6206 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -17,7 +17,7 @@ #include #include "BLI_listbase.h" -#include "BLI_resource_collector.hh" +#include "BLI_resource_scope.hh" #include "BKE_screen.h" @@ -138,7 +138,7 @@ class FallbackSpreadsheetDrawer : public SpreadsheetDrawer { static void gather_spreadsheet_columns(const bContext *C, SpreadsheetColumnLayout &column_layout, - blender::ResourceCollector &resources) + blender::ResourceScope &scope) { Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); ID *used_id = get_used_id(C); @@ -158,16 +158,16 @@ static void gather_spreadsheet_columns(const bContext *C, return; } - return spreadsheet_columns_from_geometry(C, object_eval, column_layout, resources); + return spreadsheet_columns_from_geometry(C, object_eval, column_layout, scope); } static void spreadsheet_main_region_draw(const bContext *C, ARegion *region) { SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C); - blender::ResourceCollector resources; + blender::ResourceScope scope; SpreadsheetColumnLayout column_layout; - gather_spreadsheet_columns(C, column_layout, resources); + gather_spreadsheet_columns(C, column_layout, scope); sspreadsheet->runtime->visible_rows = column_layout.row_indices.size(); sspreadsheet->runtime->tot_columns = column_layout.columns.size(); diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc index 910bc0a34ec..7eea6c48676 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc @@ -41,13 +41,13 @@ using blender::bke::ReadAttributePtr; static void add_columns_for_instances(const InstancesComponent &instances_component, SpreadsheetColumnLayout &column_layout, - ResourceCollector &resources) + ResourceScope &scope) { Span instance_data = instances_component.instanced_data(); Span transforms = instances_component.transforms(); Vector> &columns = - resources.construct>>("columns"); + scope.construct>>("columns"); columns.append(spreadsheet_column_from_function( "Name", [instance_data](int index, CellValue &r_cell_value) { @@ -330,13 +330,13 @@ static Span filter_mesh_elements_by_selection(const bContext *C, Object *object_eval, const MeshComponent *component, const AttributeDomain domain, - ResourceCollector &resources) + ResourceScope &scope) { SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C); const bool show_only_selected = sspreadsheet->filter_flag & SPREADSHEET_FILTER_SELECTED_ONLY; if (object_eval->mode == OB_MODE_EDIT && show_only_selected) { Object *object_orig = DEG_get_original_object(object_eval); - Vector &visible_rows = resources.construct>("visible rows"); + Vector &visible_rows = scope.construct>("visible rows"); const Mesh *mesh_eval = component->get_for_read(); Mesh *mesh_orig = (Mesh *)object_orig->data; BMesh *bm = mesh_orig->edit_mesh->bm; @@ -389,14 +389,14 @@ static GeometryComponentType get_display_component_type(const bContext *C, Objec void spreadsheet_columns_from_geometry(const bContext *C, Object *object_eval, SpreadsheetColumnLayout &column_layout, - ResourceCollector &resources) + ResourceScope &scope) { SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C); const AttributeDomain domain = (AttributeDomain)sspreadsheet->attribute_domain; const GeometryComponentType component_type = get_display_component_type(C, object_eval); /* Create a resource collector that owns stuff that needs to live until drawing is done. */ - GeometrySet &geometry_set = resources.add_value( + GeometrySet &geometry_set = scope.add_value( get_display_geometry_set(sspreadsheet, object_eval, component_type), "geometry set"); const GeometryComponent *component = geometry_set.get_component_for_read(component_type); @@ -405,7 +405,7 @@ void spreadsheet_columns_from_geometry(const bContext *C, } if (component_type == GEO_COMPONENT_TYPE_INSTANCES) { add_columns_for_instances( - *static_cast(component), column_layout, resources); + *static_cast(component), column_layout, scope); return; } @@ -416,12 +416,12 @@ void spreadsheet_columns_from_geometry(const bContext *C, Vector attribute_names = get_sorted_attribute_names_to_display(*component, domain); Vector> &columns = - resources.construct>>("columns"); + scope.construct>>("columns"); for (StringRefNull attribute_name : attribute_names) { ReadAttributePtr attribute_ptr = component->attribute_try_get_for_read(attribute_name); ReadAttribute &attribute = *attribute_ptr; - resources.add(std::move(attribute_ptr), "attribute"); + scope.add(std::move(attribute_ptr), "attribute"); add_columns_for_attribute(&attribute, attribute_name, columns); } @@ -433,7 +433,7 @@ void spreadsheet_columns_from_geometry(const bContext *C, Span visible_rows; if (component_type == GEO_COMPONENT_TYPE_MESH) { visible_rows = filter_mesh_elements_by_selection( - C, object_eval, static_cast(component), domain, resources); + C, object_eval, static_cast(component), domain, scope); } else { visible_rows = IndexRange(component->attribute_domain_size(domain)).as_span(); diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.hh b/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.hh index cef731517b9..ff45b8517d1 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.hh +++ b/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.hh @@ -18,7 +18,7 @@ #include "BKE_geometry_set.hh" -#include "BLI_resource_collector.hh" +#include "BLI_resource_scope.hh" #include "spreadsheet_column_layout.hh" @@ -29,6 +29,6 @@ namespace blender::ed::spreadsheet { void spreadsheet_columns_from_geometry(const bContext *C, Object *object_eval, SpreadsheetColumnLayout &column_layout, - ResourceCollector &resources); + ResourceScope &scope); } // namespace blender::ed::spreadsheet -- cgit v1.2.3