diff --git a/CHANGELOG.md b/CHANGELOG.md index f63ca21cc440b..c59129e31e616 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ - [iOS: use shaderc-rs for glsl to spirv compilation][324] - [Changed the default node size to Auto instead of Undefined to match the Stretch implementation.][304] - Many improvements to Bevy's CI [#325][325], [#349][349], [#357][357], [#373][373], [#423][423] +- [Load assets from root path when loading directly][478] ### Fixed @@ -83,6 +84,7 @@ [423]: https://github.com/bevyengine/bevy/pull/423 [428]: https://github.com/bevyengine/bevy/pull/428 [433]: https://github.com/bevyengine/bevy/pull/433 +[478]: https://github.com/bevyengine/bevy/pull/478 ## Version 0.1.3 (2020-8-22) diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index e5b696ac51595..1cee72e6f449d 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -239,7 +239,8 @@ impl AssetServer { // TODO: add type checking here. people shouldn't be able to request a Handle for a Mesh asset pub fn load>(&self, path: P) -> Result, AssetServerError> { - self.load_untyped(path).map(Handle::from) + self.load_untyped(self.get_root_path()?.join(path)) + .map(Handle::from) } pub fn load_sync>(