From 11afe160791cdc8c043afb7a7c68cfd8ae1c6a87 Mon Sep 17 00:00:00 2001 From: Victor <59261226+VictorBulba@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:13:33 +0200 Subject: [PATCH] Fix extensionless image loading panic (#13005) Remake of #12938 targeting main --- crates/bevy_render/src/texture/image_loader.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/bevy_render/src/texture/image_loader.rs b/crates/bevy_render/src/texture/image_loader.rs index 534d064409..6bd906c1d0 100644 --- a/crates/bevy_render/src/texture/image_loader.rs +++ b/crates/bevy_render/src/texture/image_loader.rs @@ -91,13 +91,14 @@ impl AssetLoader for ImageLoader { settings: &'a ImageLoaderSettings, load_context: &'a mut LoadContext<'_>, ) -> Result { - // use the file extension for the image type - let ext = load_context.path().extension().unwrap().to_str().unwrap(); - let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; let image_type = match settings.format { - ImageFormatSetting::FromExtension => ImageType::Extension(ext), + ImageFormatSetting::FromExtension => { + // use the file extension for the image type + let ext = load_context.path().extension().unwrap().to_str().unwrap(); + ImageType::Extension(ext) + } ImageFormatSetting::Format(format) => ImageType::Format(format), }; Ok(Image::from_buffer(