griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Jacques Lucke
2025-06-09 10:04:31 +02:00
parent 60411de509 a8e461f2de
commit 3ee94825ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -484,8 +484,9 @@ static void spreadsheet_main_region_draw(const bContext *C, ARegion *region)
continue;
}
const ColumnValues *values = scope.add(std::move(values_ptr));
const eSpreadsheetColumnValueType column_type = values->type();
if (column->width <= 0.0f) {
if (column->width <= 0.0f || column_type != column->data_type) {
column->width = values->fit_column_width_px(100) / SPREADSHEET_WIDTH_UNIT;
}
const int width_in_pixels = column->width * SPREADSHEET_WIDTH_UNIT;
@@ -495,7 +496,7 @@ static void spreadsheet_main_region_draw(const bContext *C, ARegion *region)
x += width_in_pixels;
column->runtime->right_x = x;
spreadsheet_column_assign_runtime_data(column, values->type(), values->name());
spreadsheet_column_assign_runtime_data(column, column_type, values->name());
}
spreadsheet_layout.row_indices = spreadsheet_filter_rows(