diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-04 14:11:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 14:11:03 +0200 |
| commit | 5dc923d3863b504d64b19501eaec04749cd975ce (patch) | |
| tree | 8b9f62122d75a3e55cec506fb0d96b7c8a9dbfed /scene/animation/animation_cache.cpp | |
| parent | 023056bc5c1289f930a4f85916d6ddcd3d4b3ea4 (diff) | |
| parent | 125d1a7cd330ad7b2f971bad16e126b8100e6926 (diff) | |
| download | redot-engine-5dc923d3863b504d64b19501eaec04749cd975ce.tar.gz | |
Merge pull request #49297 from aaronfranke/anim-type-tr3d
Rename Animation TYPE_TRANSFORM to TYPE_TRANSFORM3D
Diffstat (limited to 'scene/animation/animation_cache.cpp')
| -rw-r--r-- | scene/animation/animation_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp index 0fe096b7cb..b317faeb00 100644 --- a/scene/animation/animation_cache.cpp +++ b/scene/animation/animation_cache.cpp @@ -80,10 +80,10 @@ void AnimationCache::_update_cache() { Ref<Resource> res; - if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM) { + if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM3D) { if (np.get_subname_count() > 1) { path_cache.push_back(Path()); - ERR_CONTINUE_MSG(animation->track_get_type(i) == Animation::TYPE_TRANSFORM, "Transform tracks can't have a subpath '" + np + "'."); + ERR_CONTINUE_MSG(animation->track_get_type(i) == Animation::TYPE_TRANSFORM3D, "Transform tracks can't have a subpath '" + np + "'."); } Node3D *sp = Object::cast_to<Node3D>(node); @@ -231,7 +231,7 @@ void AnimationCache::set_all(float p_time, float p_delta) { int tc = animation->get_track_count(); for (int i = 0; i < tc; i++) { switch (animation->track_get_type(i)) { - case Animation::TYPE_TRANSFORM: { + case Animation::TYPE_TRANSFORM3D: { Vector3 loc, scale; Quat rot; animation->transform_track_interpolate(i, p_time, &loc, &rot, &scale); |