@@ -453,16 +453,16 @@ fn entity_from_path(
453
453
/// Verify that there are no ancestors of a given entity that have an [`AnimationPlayer`].
454
454
fn verify_no_ancestor_player (
455
455
player_parent : Option < & Parent > ,
456
- parents : & Query < ( Option < With < AnimationPlayer > > , Option < & Parent > ) > ,
456
+ parents : & Query < ( Has < AnimationPlayer > , Option < & Parent > ) > ,
457
457
) -> bool {
458
458
let Some ( mut current) = player_parent. map ( Parent :: get) else {
459
459
return true ;
460
460
} ;
461
461
loop {
462
- let Ok ( ( maybe_player , parent) ) = parents. get ( current) else {
462
+ let Ok ( ( has_player , parent) ) = parents. get ( current) else {
463
463
return true ;
464
464
} ;
465
- if maybe_player . is_some ( ) {
465
+ if has_player {
466
466
return false ;
467
467
}
468
468
if let Some ( parent) = parent {
@@ -483,7 +483,7 @@ pub fn animation_player(
483
483
names : Query < & Name > ,
484
484
transforms : Query < & mut Transform > ,
485
485
morphs : Query < & mut MorphWeights > ,
486
- parents : Query < ( Option < With < AnimationPlayer > > , Option < & Parent > ) > ,
486
+ parents : Query < ( Has < AnimationPlayer > , Option < & Parent > ) > ,
487
487
mut animation_players : Query < ( Entity , Option < & Parent > , & mut AnimationPlayer ) > ,
488
488
) {
489
489
animation_players
@@ -515,7 +515,7 @@ fn run_animation_player(
515
515
transforms : & Query < & mut Transform > ,
516
516
morphs : & Query < & mut MorphWeights > ,
517
517
maybe_parent : Option < & Parent > ,
518
- parents : & Query < ( Option < With < AnimationPlayer > > , Option < & Parent > ) > ,
518
+ parents : & Query < ( Has < AnimationPlayer > , Option < & Parent > ) > ,
519
519
children : & Query < & Children > ,
520
520
) {
521
521
let paused = player. paused ;
@@ -601,7 +601,7 @@ fn apply_animation(
601
601
transforms : & Query < & mut Transform > ,
602
602
morphs : & Query < & mut MorphWeights > ,
603
603
maybe_parent : Option < & Parent > ,
604
- parents : & Query < ( Option < With < AnimationPlayer > > , Option < & Parent > ) > ,
604
+ parents : & Query < ( Has < AnimationPlayer > , Option < & Parent > ) > ,
605
605
children : & Query < & Children > ,
606
606
) {
607
607
if let Some ( animation_clip) = animations. get ( & animation. animation_clip ) {
0 commit comments