fix(ui): rebase conflicts

This commit is contained in:
psychedelicious
2024-08-17 08:39:10 +10:00
parent c4e95684b5
commit 5dda364b2c
8 changed files with 14 additions and 19 deletions

View File

@@ -13,9 +13,9 @@ export const useEntitySelectionColor = (entityIdentifier: CanvasEntityIdentifier
if (!entity) {
return 'base.400';
} else if (entity.type === 'inpaint_mask') {
return rgbColorToString(entity.fill);
return rgbColorToString(entity.fill.color);
} else if (entity.type === 'regional_guidance') {
return rgbColorToString(entity.fill);
return rgbColorToString(entity.fill.color);
} else {
return 'base.400';
}