godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #74948 from AThousandShips/animation_key

Browse Source 
Fix type check in AnimationTrackKeyEdit for methods
This commit is contained in:
Rémi Verschelde
2023-06-09 15:30:16 +02:00
parent a5de7e3820 ad769903b0
commit a3a8d3463e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/animation_track_editor.cpp
View File

@@ -209,7 +209,7 @@ bool AnimationTrackKeyEdit::_set(const StringName &p_name, const Variant &p_valu
if (t != args[idx].get_type()) { if (t != args[idx].get_type()) {
Callable::CallError err; Callable::CallError err;
if (Variant::can_convert(args[idx].get_type(), t)) { if (Variant::can_convert_strict(args[idx].get_type(), t)) {
Variant old = args[idx]; Variant old = args[idx];
Variant *ptrs[1] = { &old }; Variant *ptrs[1] = { &old };
Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err); Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
@@ -794,7 +794,7 @@ bool AnimationMultiTrackKeyEdit::_set(const StringName &p_name, const Variant &p
if (t != args[idx].get_type()) { if (t != args[idx].get_type()) {
Callable::CallError err; Callable::CallError err;
if (Variant::can_convert(args[idx].get_type(), t)) { if (Variant::can_convert_strict(args[idx].get_type(), t)) {
Variant old = args[idx]; Variant old = args[idx];
Variant *ptrs[1] = { &old }; Variant *ptrs[1] = { &old };
Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err); Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);