[Bf-blender-cvs] [59f49072d06] master: Fix T87308: don't show columns when there are no instances
Jacques Lucke
noreply at git.blender.org
Mon Apr 12 09:10:38 CEST 2021
Commit: 59f49072d06859f69e9f6e381f5f7f168ee74d24
Author: Jacques Lucke
Date: Mon Apr 12 09:10:26 2021 +0200
Branches: master
https://developer.blender.org/rB59f49072d06859f69e9f6e381f5f7f168ee74d24
Fix T87308: don't show columns when there are no instances
===================================================================
M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
===================================================================
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 337e1e68f1a..f33a6473d45 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -284,6 +284,10 @@ Span<int64_t> GeometryDataSource::get_selected_element_indices() const
void InstancesDataSource::foreach_default_column_ids(
FunctionRef<void(const SpreadsheetColumnID &)> fn) const
{
+ if (component_->instances_amount() == 0) {
+ return;
+ }
+
SpreadsheetColumnID column_id;
column_id.index = -1;
column_id.name = (char *)"Name";
@@ -300,6 +304,10 @@ void InstancesDataSource::foreach_default_column_ids(
std::unique_ptr<ColumnValues> InstancesDataSource::get_column_values(
const SpreadsheetColumnID &column_id) const
{
+ if (component_->instances_amount() == 0) {
+ return {};
+ }
+
const std::array<const char *, 3> suffixes = {" X", " Y", " Z"};
const int size = this->tot_rows();
if (STREQ(column_id.name, "Name")) {
More information about the Bf-blender-cvs
mailing list