Skip to content

Commit

Permalink
Merge pull request #45438 from Norrox/fixtweennullcheck
Browse files Browse the repository at this point in the history
Fix the tween null check
  • Loading branch information
akien-mga authored Feb 24, 2021
2 parents 829b6ef + 5b2100d commit 2ffecb7
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions scene/animation/tween.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,9 @@ void Tween::interpolate_property(Object *p_object, NodePath p_property, Variant
return;
}

// Check that the target object is valid
ERR_FAIL_COND_MSG(p_object == nullptr, vformat("The Tween \"%s\"'s target node is `null`. Is the node reference correct?", get_name()));

// Get the property from the node path
p_property = p_property.get_as_property_path();

Expand Down Expand Up @@ -1378,6 +1381,9 @@ void Tween::interpolate_method(Object *p_object, StringName p_method, Variant p_
return;
}

// Check that the target object is valid
ERR_FAIL_COND_MSG(p_object == nullptr, vformat("The Tween \"%s\"'s target node is `null`. Is the node reference correct?", get_name()));

// Convert any integers into REALs as they are better for interpolation
if (p_initial_val.get_type() == Variant::INT) {
p_initial_val = p_initial_val.operator real_t();
Expand Down

0 comments on commit 2ffecb7

Please sign in to comment.