Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/bevy_mesh/src/skinning.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bevy_asset::{Asset, Handle};
use bevy_asset::{AsAssetId, Asset, AssetId, Handle};
use bevy_ecs::{component::Component, entity::Entity, prelude::ReflectComponent};
use bevy_math::Mat4;
use bevy_reflect::prelude::*;
Expand All @@ -12,6 +12,16 @@ pub struct SkinnedMesh {
pub joints: Vec<Entity>,
}

impl AsAssetId for SkinnedMesh {
type Asset = SkinnedMeshInverseBindposes;

// We implement this so that `AssetChanged` will work to pick up any changes
// to `SkinnedMeshInverseBindposes`.
fn as_asset_id(&self) -> AssetId<Self::Asset> {
self.inverse_bindposes.id()
}
}

#[derive(Asset, TypePath, Debug)]
pub struct SkinnedMeshInverseBindposes(Box<[Mat4]>);

Expand Down
1 change: 1 addition & 0 deletions crates/bevy_pbr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ smallvec = "1.6"
nonmax = "0.5"
static_assertions = "1"
tracing = { version = "0.1", default-features = false, features = ["std"] }
offset-allocator = "0.2"

[lints]
workspace = true
Expand Down
1 change: 0 additions & 1 deletion crates/bevy_pbr/src/meshlet/instance_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ impl InstanceManager {
None,
None,
None,
None,
);

// Append instance data
Expand Down
Loading
Loading