BEVY_ASSET_ROOT with higher priority than CARGO_MANIFEST_DIR + update…

…d doc
bevyengine · Jul 17, 2022 · d6b6d5a · d6b6d5a
1 parent 3615a4a
commit d6b6d5a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/crates/bevy_asset/src/io/file_asset_io.rs b/crates/bevy_asset/src/io/file_asset_io.rs
@@ -60,13 +60,15 @@ impl FileAssetIo {
     /// Returns the base path of the assets directory, which is normally the executable's parent
     /// directory.
     ///
-    /// If the `CARGO_MANIFEST_DIR` environment variable is set, then its value will be used
+    /// If a `BEVY_ASSET_ROOT` environment variable is set, then its value will be used.
+    /// 
+    /// Else if the `CARGO_MANIFEST_DIR` environment variable is set, then its value will be used
     /// instead. It's set by cargo when running with `cargo run`.
     pub fn get_base_path() -> PathBuf {
-        if let Ok(manifest_dir) = env::var("CARGO_MANIFEST_DIR") {
-            PathBuf::from(manifest_dir)
-        } else if let Ok(env_bevy_asset_root) = env::var("BEVY_ASSET_ROOT") {
+        if let Ok(env_bevy_asset_root) = env::var("BEVY_ASSET_ROOT") {
             PathBuf::from(env_bevy_asset_root)
+        } else if let Ok(manifest_dir) = env::var("CARGO_MANIFEST_DIR") {
+            PathBuf::from(manifest_dir)
         } else {
             env::current_exe()
                 .map(|path| {