(Token Merging) Prevent some confusion

[papuSpartan]

Related to #9256

I want to make sure that there isn't any confusion when cranking up the top slider and not seeing any noticeable speedup. The more important slider should be the high-res pass one so i moved it up. I also added an explicit mention of "first pass" on the second.

[AUTOMATIC1111]

You are right that the way options are now is a bit unintuitive. How about, instead of reordering, use token_merging_ratio if token_merging_ratio_hr is 0.

[jrittvo]

https://github.com/dbolya/tomesd/releases/tag/v0.1.3

[w-e-w]

suggestion separate token merging setting for img2img and txt2img first pass I can see one would like to have use high token merge ratio for img2img but low for txt2img first pass

or have an ouption to ues token_merging_ratio_hr as the setting for img2img

[neavo]

You are right that the way options are now is a bit unintuitive. How about, instead of reordering, use token_merging_ratio if token_merging_ratio_hr is 0.

suggestion separate token merging setting for img2img and txt2img first pass I can see one would like to have use high token merge ratio for img2img but low for txt2img first pass

or have an ouption to ues token_merging_ratio_hr as the setting for img2img

Couldn't agree more !!

[AUTOMATIC1111]

9fd6c1e3430f5947add23e2e94ac816c2546481c among other things reworks and rewords settings to not be confusing: one general slider that applies to everything and two additional sliders that if non-zero will override the general slider.