Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #65609 from dalexeev/animated-sprite

Browse source 
`AnimatedSprite{2D,3D}` improvements
This commit is contained in:
Rémi Verschelde 2023-01-05 15:00:31 +01:00
commit 798582acf0
No known key found for this signature in database
GPG key ID: C3336907360768E1
13 changed files with 379 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/animation_track_editor_plugins.cpp
View file

@ -426,7 +426,7 @@ Rect2 AnimationTrackEditSpriteFrame::get_key_rect(int p_index, float p_pixels_se
animation_name = get_animation()->track_get_key_value(animation_track, animaiton_index);
}
Ref<Texture2D> texture = sf->get_frame(animation_name, frame);
Ref<Texture2D> texture = sf->get_frame_texture(animation_name, frame);
if (!texture.is_valid()) {
return AnimationTrackEdit::get_key_rect(p_index, p_pixels_sec);
}
@ -518,7 +518,7 @@ void AnimationTrackEditSpriteFrame::draw_key(int p_index, float p_pixels_sec, in
animation_name = get_animation()->track_get_key_value(animation_track, animaiton_index);
}
texture = sf->get_frame(animation_name, frame);
texture = sf->get_frame_texture(animation_name, frame);
if (!texture.is_valid()) {
AnimationTrackEdit::draw_key(p_index, p_pixels_sec, p_x, p_selected, p_clip_left, p_clip_right);
return;