Hotfix for MIERUNE#493 (MIERUNE#495)

MIERUNE#493
Project-PLATEAU · Mar 19, 2024 · 5182c4c · 5182c4c
1 parent ab19a0b
commit 5182c4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/nusamai/src/sink/cesiumtiles/metadata/mod.rs b/nusamai/src/sink/cesiumtiles/metadata/mod.rs
@@ -174,7 +174,9 @@ impl Class {
 
             // Fill in the default values for the properties that don't occur in the input
             for (key, prop) in &mut self.properties {
-                if obj.attributes.contains_key(key) || obj.stereotype.id().is_some() {
+                if obj.attributes.contains_key(key)
+                    || (key == "id" && obj.stereotype.id().is_some())
+                {
                     continue;
                 }
 

diff --git a/nusamai/src/sink/gltf/metadata/mod.rs b/nusamai/src/sink/gltf/metadata/mod.rs
@@ -174,7 +174,9 @@ impl Class {
 
             // Fill in the default values for the properties that don't occur in the input
             for (key, prop) in &mut self.properties {
-                if obj.attributes.contains_key(key) || obj.stereotype.id().is_some() {
+                if obj.attributes.contains_key(key)
+                    || (key == "id" && obj.stereotype.id().is_some())
+                {
                     continue;
                 }