mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-02 22:20:50 -06:00
Merge wp/A1
This commit is contained in:
@@ -215,9 +215,7 @@ impl Exporter<'_> {
|
||||
/// swatch's CMYK equivalent is the alternate space).
|
||||
fn solid(&mut self, c: &Color, swatch: Option<&str>) -> krilla::color::Color {
|
||||
use krilla::color::separation::{Color as SepColor, SeparationColorant, SeparationSpace};
|
||||
let spot = swatch
|
||||
.and_then(|n| self.doc.swatches.iter().find(|s| s.spot && s.name == n))
|
||||
.and_then(|s| s.paint.color().map(|sc| (s.name.clone(), sc)));
|
||||
let spot = swatch.and_then(|n| self.doc.swatch(n).filter(|s| s.spot)).and_then(|s| s.paint.color().map(|sc| (s.name.clone(), sc)));
|
||||
let Some((name, sc)) = spot else { return self.col(c) };
|
||||
let cms = vectorcraft_color::cms::active();
|
||||
let intent = cms.settings().intent;
|
||||
|
||||
Reference in New Issue
Block a user