diff --git a/locales/zh/nodeDefs.json b/locales/zh/nodeDefs.json index a73191c..9489841 100644 --- a/locales/zh/nodeDefs.json +++ b/locales/zh/nodeDefs.json @@ -6638,6 +6638,37 @@ } } }, + "easy joyCaption3API": { + "display_name": "JoyCaption3(硅基流动)", + "inputs": { + "image": { + "name": "图像" + }, + "do_sample": { + "name": "执行采样" + }, + "temperature": { + "name": "温度" + }, + "max_tokens": { + "name": "最大词令牌数" + }, + "caption_type": { + "name": "提示词类型" + }, + "caption_length": { + "name": "提示词长度" + }, + "name_input": { + "name": "名称输入" + } + }, + "outputs": { + "0": { + "name": "提示词" + } + } + }, "easy if": { "display_name": "If判断", "inputs": { diff --git a/py/nodes/image.py b/py/nodes/image.py index 1b07838..4218726 100644 --- a/py/nodes/image.py +++ b/py/nodes/image.py @@ -2022,7 +2022,7 @@ class makeImageForICRepaint: image, mask, context_mask = None, None, None # resize - if img1_h != img2_h or img1_w != img2_w: + if img1_h != img2_h and img1_w != img2_w: width, height = img2_w, img2_h fit = 'crop' if method != 'uniform width':