Merge main into fix/aligned-paint-rows-of-design-art

This commit is contained in:
dotCooCoo
2026-11-14 19:10:09 -08:00
357 changed files with 26728 additions and 3919 deletions
+7 -3
View File
@@ -444,6 +444,7 @@ pub(crate) fn apply(s: &mut Session, p: &Value) -> Result<Value> {
}
super::params::check_effect_color(C, id, &params)?;
super::params::check_effect_channel(C, id, &params)?;
super::params::check_effect_center(C, id, &params)?;
// Crop Marks take their style from the preferences when applied.
if id == effects::CROP_MARKS && params.get("style").is_none() {
params["style"] = json!(s.crop_mark_style().id());
@@ -745,7 +746,7 @@ fn lighting_preset(s: &mut Session, p: &Value) -> Result<Value> {
/// sets its Warp style (`warpStyle`), its 3D type (`threeDType`) or visibility (`visible`), as one
/// undo step. They are checked as `effect.apply` checks them, and a visible 3D effect must still
/// fit; a hidden one has its given values checked. → `{ids}`.
fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
pub(crate) fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
const C: &str = "effect.setParams";
let index = index_param(p, "index", C)?;
let mut params = p.get("params").cloned().unwrap_or(Value::Null);
@@ -767,6 +768,7 @@ fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
for effect in &edited {
super::params::check_effect_color(C, effect, &params)?;
super::params::check_effect_channel(C, effect, &params)?;
super::params::check_effect_center(C, effect, &params)?;
}
if edited.iter().any(|e| texture_load_effect(e)) {
load_texture(&mut params, C)?;
@@ -860,11 +862,13 @@ fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
const GLASS: &str = "distort.glass";
/// Effect › Texture › Texturizer.
const TEXTURIZER: &str = "texture.texturizer";
/// Effect › Artistic › Rough Pastels.
const ROUGH_PASTELS: &str = "artistic.roughPastels";
/// Does effect `id` have Load Texture: a `textureImage` that `effect.apply` reads from an image
/// file (Glass, Texturizer)?
/// file (Glass, Texturizer, Rough Pastels)?
pub(crate) fn texture_load_effect(id: &str) -> bool {
id == GLASS || id == TEXTURIZER
id == GLASS || id == TEXTURIZER || id == ROUGH_PASTELS
}
/// Glass's `textureImage` in `params` as Glass stores it: an image file (`{path}`, or `{name?,