diff --git a/config.json b/config.json index 4c1fb0f28..feb42d374 100644 --- a/config.json +++ b/config.json @@ -173,11 +173,11 @@ "save_training_settings_to_txt": true, "save_txt": false, "sd_checkpoint_cache": 0, - "sd_checkpoint_hash": "f93e6a50acf7c1b1e6d5ccaf92bae207cb5d2222da3ddc5108df4c928d84255a", + "sd_checkpoint_hash": "cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516", "sd_hypernetwork_strength": 1.0, "sd_hypernetwork": "None", "sd_lora": "", - "sd_model_checkpoint": "uberrealisticpornmerge-v13.safetensors [f93e6a50ac]", + "sd_model_checkpoint": "sd-v15-runwayml.ckpt [cc6cb27103]", "sd_vae_as_default": false, "sd_vae_checkpoint_cache": 0, "sd_vae": "vae-ft-mse-840000-ema-pruned.ckpt", @@ -214,5 +214,6 @@ "img_max_size_mp": 200.0, "image_browser_active_tabs": "txt2img, img2img, txt2img-grids, img2img-grids, Extras, Favorites, Others, Maintenance", "image_browser_enable_maint": true, - "image_browser_ranking_pnginfo": false + "image_browser_ranking_pnginfo": false, + "uni_pc_order": 3 } \ No newline at end of file diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 58d0eb552..d20827b7d 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 58d0eb552449e3fc235e26e9a75c15bc1b81b07c +Subproject commit d20827b7d72c014d768a2ba74578cb12ef8ff58d diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 7c86bb499..5fc272a12 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -500,7 +500,7 @@ class Script(scripts.Script): zs = process_axis(z_opt, z_values) # this could be moved to common code, but unlikely to be ever triggered anywhere else - Image.MAX_IMAGE_PIXELS = opts.img_max_size_mp * 1.1 # allow 10% overhead for margins and legend + Image.MAX_IMAGE_PIXELS = opts.img_max_size_mp * 1000000 * 1.1 # allow 10% overhead for margins and legend grid_mp = round(len(xs) * len(ys) * len(zs) * p.width * p.height / 1000000) if grid_mp > opts.img_max_size_mp: return Processed(p, [], p.seed, info=f'Error: Resulting grid would be too large ({grid_mp} MPixels) (max configured size is {opts.img_max_size_mp} MPixels)')