From 1fdb9ecfdbb22fa82efb21f445d4d1d731836537 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 11 Jun 2026 08:19:27 +0000 Subject: [PATCH] Fix XYZ grid sub-grid count ignoring sub-grids created with the main grid draw_xyz_grid inserts one sub-grid per Z value whenever the main grid or sub-grids are enabled, but have_subgrids only counted them when 'Include sub grids' was checked. With main grid on and sub grids off, the Z sub-grids leaked into the results as ordinary images (shown in the gallery, fed into video creation, misaligning infotexts) and the removal branch was unreachable since its condition contradicted itself. Count sub-grids based on the same condition that inserts them. https: //claude.ai/code/session_014QWKWgKvMevcuvfCnsYoT2 Co-Authored-By: Claude --- scripts/xyz_grid.py | 2 +- scripts/xyz_grid_on.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index be69999e0..83b8db79d 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -393,7 +393,7 @@ class XYZGridScript(scripts_manager.Script): return processed # something broke, no further handling needed. have_grid = 1 if include_grid else 0 - have_subgrids = len(zs) if len(zs) > 1 and include_subgrids else 0 + have_subgrids = len(zs) if len(zs) > 1 and (include_grid or include_subgrids) else 0 # sub-grids are created whenever the main grid is, see draw_xyz_grid have_images = processed.images[have_grid+have_subgrids:] processed.infotexts[:have_grid+have_subgrids] = grid_infotext[:have_grid+have_subgrids] # update infotexts with grid and subgrid info log.debug(f'XYZ grid: grid={have_grid} subgrids={have_subgrids} images={len(have_images)} total={len(processed.images)}') diff --git a/scripts/xyz_grid_on.py b/scripts/xyz_grid_on.py index df17c4fb0..26eaeee64 100644 --- a/scripts/xyz_grid_on.py +++ b/scripts/xyz_grid_on.py @@ -422,7 +422,7 @@ class XYZGridScript(scripts_manager.Script): return processed # something broke, no further handling needed. have_grid = 1 if include_grid else 0 - have_subgrids = len(zs) if len(zs) > 1 and include_subgrids else 0 + have_subgrids = len(zs) if len(zs) > 1 and (include_grid or include_subgrids) else 0 # sub-grids are created whenever the main grid is, see draw_xyz_grid have_images = processed.images[have_grid+have_subgrids:] processed.infotexts[:have_grid+have_subgrids] = grid_infotext[:have_grid+have_subgrids] # update infotexts with grid and subgrid info log.debug(f'XYZ grid: grid={have_grid} subgrids={have_subgrids} images={len(have_images)} total={len(processed.images)}')