From 37d89a89bf5ff15a10932925c8a5e3bf0e5a08a9 Mon Sep 17 00:00:00 2001
From: yolain <yolain@163.com>
Date: Sat, 6 Jan 2024 10:56:01 +0800
Subject: [PATCH] fix:modelmergeblock with lora is not working

---
 py/easyNodes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/easyNodes.py b/py/easyNodes.py
index 9df7674..04152e4 100644
--- a/py/easyNodes.py
+++ b/py/easyNodes.py
@@ -693,8 +693,8 @@ class easyXYPlot:
                 if optional_lora_stack is not None and optional_lora_stack != []:
                     for lora in optional_lora_stack:
                         lora_name = lora["lora_name"]
-                        model = lora["model"]
-                        clip = lora["clip"]
+                        model = model if model is not None else lora["model"]
+                        clip = clip if clip is not None else lora["clip"]
                         lora_model_strength = lora["lora_model_strength"]
                         lora_clip_strength = lora["lora_clip_strength"]
                         if "lbw" in lora: