diff options
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/animation_blend_tree.cpp | 5 | ||||
| -rw-r--r-- | scene/resources/material.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index 31ee31745a..66a9c5babd 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -314,6 +314,11 @@ AnimationNodeOneShot::AnimationNodeOneShot() { mix = MIX_MODE_BLEND; sync = false; + + active = "active"; + prev_active = "prev_active"; + time = "time"; + remaining = "remaining"; } //////////////////////////////////////////////// diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 143a1438ea..d6c22d5664 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -34,7 +34,7 @@ void Material::set_next_pass(const Ref<Material> &p_pass) { - ERR_FAIL_COND(p_pass == this); + ERR_FAIL_COND(p_pass.ptr() == this); if (next_pass == p_pass) return; |