Merge branch 'main' into serena/orient-to-face

KittyCAD · Jan 28, 2025 · a779821 · a779821
2 parents 9de39f3 + 69e8ed7
commit a779821
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modeling-cmds/Cargo.toml b/modeling-cmds/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kittycad-modeling-cmds"
-version = "0.2.92"
+version = "0.2.93"
 edition = "2021"
 authors = ["KittyCAD, Inc."]
 description = "Commands in the KittyCAD Modeling API"

diff --git a/modeling-cmds/src/def_enum.rs b/modeling-cmds/src/def_enum.rs
@@ -790,7 +790,7 @@ define_modeling_cmd_enum! {
             pub cut_type: CutType,
             /// The ID to use for the newly created fillet face.
             /// If not provided, the server will randomly generate one.
-            #[serde(default)]
+            #[serde(default, skip_serializing_if = "Option::is_none")]
             pub face_id: Option<Uuid>,
         }
 
@@ -1221,6 +1221,8 @@ define_modeling_cmd_enum! {
 
         /// Set the units of the scene.
         /// For all following commands, the units will be interpreted as the given units.
+        /// Any previously executed commands will not be affected or have their units changed.
+        /// They will remain in the units they were originally executed in.
         #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
         #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
         #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]