Merge remote-tracking branch 'origin/dev' into soft-inpainting

# Conflicts:
#	modules/processing.py

1 files changed, 6 insertions, 1 deletions

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 939d8605..0dc255bc 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -205,13 +205,14 @@ def csv_string_to_list_strip(data_str):
 

 

 class AxisOption:

-    def __init__(self, label, type, apply, format_value=format_value_add_label, confirm=None, cost=0.0, choices=None):

+    def __init__(self, label, type, apply, format_value=format_value_add_label, confirm=None, cost=0.0, choices=None, prepare=None):

         self.label = label

         self.type = type

         self.apply = apply

         self.format_value = format_value

         self.confirm = confirm

         self.cost = cost

+        self.prepare = prepare

         self.choices = choices

 

 

@@ -536,6 +537,8 @@ class Script(scripts.Script):
 

             if opt.choices is not None and not csv_mode:

                 valslist = vals_dropdown

+            elif opt.prepare is not None:

+                valslist = opt.prepare(vals)

             else:

                 valslist = csv_string_to_list_strip(vals)

 

@@ -773,6 +776,8 @@ class Script(scripts.Script):
                 # TODO: See previous comment about intentional data misalignment.

                 adj_g = g-1 if g > 0 else g

                 images.save_image(processed.images[g], p.outpath_grids, "xyz_grid", info=processed.infotexts[g], extension=opts.grid_format, prompt=processed.all_prompts[adj_g], seed=processed.all_seeds[adj_g], grid=True, p=processed)

+                if not include_sub_grids:  # if not include_sub_grids then skip saving after the first grid

+                    break

 

         if not include_sub_grids:

             # Done with sub-grids, drop all related information: