diff --git a/modules/postprocess/yolo.py b/modules/postprocess/yolo.py index b162240e0..44f72237e 100644 --- a/modules/postprocess/yolo.py +++ b/modules/postprocess/yolo.py @@ -191,12 +191,20 @@ class YoloRestorer(Detailer): pp = None shared.opts.data['mask_apply_overlay'] = True resolution = 512 if shared.sd_model_type in ['none', 'sd', 'lcm', 'unknown'] else 1024 + orig_prompt: str = orig_p.get('all_prompts', [''])[0] + orig_negative: str = orig_p.get('all_negative_prompts', [''])[0] prompt: str = orig_p.get('refiner_prompt', '') negative: str = orig_p.get('refiner_negative', '') if len(prompt) == 0: - prompt = orig_p.get('all_prompts', [''])[0] + prompt = orig_prompt + else: + prompt = prompt.replace('[PROMPT]', orig_prompt) + prompt = prompt.replace('[prompt]', orig_prompt) if len(negative) == 0: - negative = orig_p.get('all_negative_prompts', [''])[0] + negative = orig_negative + else: + negative = negative.replace('[PROMPT]', orig_negative) + negative = negative.replace('[prompt]', orig_negative) prompt_lines = prompt.split('\n') negative_lines = negative.split('\n') prompt = prompt_lines[i % len(prompt_lines)] diff --git a/wiki b/wiki index 53def8203..84d0a46e9 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 53def8203b6799cbd659327c1af6aa5af9cb9a70 +Subproject commit 84d0a46e9d686dd971d51ae2c1d29e60e57bf233