Merge branch 'blender-v4.1-release'

This commit is contained in:
Jacques Lucke
2024-03-03 00:35:37 +01:00

View File

@@ -1347,13 +1347,11 @@ void UI_view2d_dot_grid_draw(const View2D *v2d,
int count_x;
float start_x;
/* Count points that fit in viewport minus space for the scroll-bars. */
grid_axis_start_and_count(
step, v2d->cur.xmin, v2d->cur.xmax - V2D_SCROLL_WIDTH, &start_x, &count_x);
/* Count points that fit in viewport. */
grid_axis_start_and_count(step, v2d->cur.xmin, v2d->cur.xmax, &start_x, &count_x);
int count_y;
float start_y;
grid_axis_start_and_count(
step, v2d->cur.ymin + V2D_SCROLL_HEIGHT, v2d->cur.ymax, &start_y, &count_y);
grid_axis_start_and_count(step, v2d->cur.ymin, v2d->cur.ymax, &start_y, &count_y);
if (count_x == 0 || count_y == 0) {
continue;
}