Merge branch 'AUTOMATIC1111:master' into fix/alternating-words-emphasis

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index 35164093..4ffc369b 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -152,7 +152,7 @@ def basedir():
 

 scripts_data = []

 ScriptFile = namedtuple("ScriptFile", ["basedir", "filename", "path"])

-ScriptClassData = namedtuple("ScriptClassData", ["script_class", "path", "basedir"])

+ScriptClassData = namedtuple("ScriptClassData", ["script_class", "path", "basedir", "module"])

 

 

 def list_scripts(scriptdirname, extension):

@@ -206,7 +206,7 @@ def load_scripts():
 

             for key, script_class in module.__dict__.items():

                 if type(script_class) == type and issubclass(script_class, Script):

-                    scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir))

+                    scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))

 

         except Exception:

             print(f"Error loading script: {scriptfile.filename}", file=sys.stderr)

@@ -241,7 +241,7 @@ class ScriptRunner:
         self.alwayson_scripts.clear()

         self.selectable_scripts.clear()

 

-        for script_class, path, basedir in scripts_data:

+        for script_class, path, basedir, script_module in scripts_data:

             script = script_class()

             script.filename = path

             script.is_txt2img = not is_img2img