diff options
| -rw-r--r-- | core/variant_op.cpp | 8 | ||||
| -rw-r--r-- | scene/animation/animation_tree_player.cpp | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 5463e1cabb..9887c50dd8 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -3461,12 +3461,18 @@ void Variant::blend(const Variant& a, const Variant& b, float c, Variant &r_dst) const Rect2 *rb = reinterpret_cast<const Rect2*>(b._data._mem); r_dst=Rect2(ra->pos + rb->pos * c, ra->size + rb->size * c); } return; - case VECTOR3:{ r_dst=*reinterpret_cast<const Vector2*>(a._data._mem)+*reinterpret_cast<const Vector2*>(b._data._mem)*c; } return; + case VECTOR3:{ r_dst=*reinterpret_cast<const Vector3*>(a._data._mem)+*reinterpret_cast<const Vector3*>(b._data._mem)*c; } return; case _AABB:{ const AABB *ra = reinterpret_cast<const AABB*>(a._data._mem); const AABB *rb = reinterpret_cast<const AABB*>(b._data._mem); r_dst=AABB(ra->pos + rb->pos * c, ra->size + rb->size * c); } return; + case QUAT:{ + Quat empty_rot; + const Quat *qa = reinterpret_cast<const Quat*>(a._data._mem); + const Quat *qb = reinterpret_cast<const Quat*>(b._data._mem); + r_dst=*qa * empty_rot.slerp(*qb,c); + } return; case COLOR:{ const Color *ca = reinterpret_cast<const Color*>(a._data._mem); const Color *cb = reinterpret_cast<const Color*>(b._data._mem); diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index b07611b318..a66a2849ae 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -861,8 +861,9 @@ void AnimationTreePlayer::_process_animation(float p_delta) { if (!t.node) continue; - //if (E->get()->t.type!=Animation::TYPE_TRANSFORM) - // continue; + + if(t.property) // value track; was applied in step 2 + continue; Transform xform; xform.basis=t.rot; |