Merge branch 'main' into xiyu/adjustable_display_limit

open-rmf · Aug 28, 2024 · 4ef339b · 4ef339b
2 parents 5f6faf2 + 5bbbc0c
commit 4ef339b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rmf_site_editor/src/site_asset_io.rs b/rmf_site_editor/src/site_asset_io.rs
@@ -288,7 +288,11 @@ impl Plugin for SiteAssetIoPlugin {
             "package",
             BevyAssetSource::build().with_reader(|| {
                 Box::new(SiteAssetReader::new(|path: &Path| {
-                    let path = (*expand_package_path(path.to_str().unwrap(), None)).to_owned();
+                    let path = (*expand_package_path(
+                        &("package://".to_owned() + path.to_str().unwrap()),
+                        None,
+                    ))
+                    .to_owned();
                     Box::pin(async move { load_from_file(path.into()) })
                 }))
             }),