fix build break w/o webp feature

bevyengine · Aug 7, 2021 · 29f4a4b · 29f4a4b
1 parent c73653d
commit 29f4a4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
@@ -56,4 +56,4 @@ dds = ["image/dds"]
 tga = ["image/tga"]
 jpeg = ["image/jpeg"]
 bmp = ["image/bmp"]
-webp = ["webp_lib"]
+webp = ["image/webp", "webp_lib"]
diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
@@ -63,7 +63,8 @@ use texture::HdrTextureLoader;
     feature = "dds",
     feature = "tga",
     feature = "jpeg",
-    feature = "bmp"
+    feature = "bmp",
+    feature = "webp"
 ))]
 use texture::ImageTextureLoader;
 
@@ -108,7 +109,8 @@ impl Plugin for RenderPlugin {
             feature = "dds",
             feature = "tga",
             feature = "jpeg",
-            feature = "bmp"
+            feature = "bmp",
+            feature = "webp"
         ))]
         {
             app.init_asset_loader::<ImageTextureLoader>();

diff --git a/crates/bevy_render/src/texture/texture.rs b/crates/bevy_render/src/texture/texture.rs
@@ -230,6 +230,7 @@ impl Texture {
                 "image/jpeg" => Ok(image::ImageFormat::Jpeg),
                 "image/bmp" => Ok(image::ImageFormat::Bmp),
                 "image/x-bmp" => Ok(image::ImageFormat::Bmp),
+                #[cfg(feature = "webp")]
                 "image/webp" => Ok(image::ImageFormat::WebP),
                 _ => Err(TextureError::InvalidImageMimeType(mime_type.to_string())),
             },
@@ -244,6 +245,7 @@ impl Texture {
         // cases.
 
         let dyn_img = match format {
+            #[cfg(feature = "webp")]
             image::ImageFormat::WebP => webp_lib::Decoder::new(buffer)
                 .decode()
                 .ok_or_else(|| {