godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-20 14:45:44 +00:00
Code Releases Wiki Activity

Refactored variant constructor logic

Browse Source
This commit is contained in:
reduz
2020-11-09 00:19:09 -03:00
parent 593e35346a
commit 221a2a1742
33 changed files with 1369 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/animation_track_editor.cpp
View File

@@ -228,9 +228,9 @@ public:
if (Variant::can_convert(args[idx].get_type(), t)) {
Variant old = args[idx];
Variant *ptrs[1] = { &old };
args.write[idx] = Variant::construct(t, (const Variant **)ptrs, 1, err);
Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
} else {
args.write[idx] = Variant::construct(t, nullptr, 0, err);
Variant::construct(t, args.write[idx], nullptr, 0, err);
}
change_notify_deserved = true;
d_new["args"] = args;
@@ -846,9 +846,9 @@ public:
if (Variant::can_convert(args[idx].get_type(), t)) {
Variant old = args[idx];
Variant *ptrs[1] = { &old };
args.write[idx] = Variant::construct(t, (const Variant **)ptrs, 1, err);
Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
} else {
args.write[idx] = Variant::construct(t, nullptr, 0, err);
Variant::construct(t, args.write[idx], nullptr, 0, err);
}
change_notify_deserved = true;
d_new["args"] = args;
@@ -4587,7 +4587,8 @@ void AnimationTrackEditor::_add_method_key(const String &p_method) {
params.push_back(arg);
} else {
Callable::CallError ce;
Variant arg = Variant::construct(E->get().arguments[i].type, nullptr, 0, ce);
Variant arg;
Variant::construct(E->get().arguments[i].type, arg, nullptr, 0, ce);
params.push_back(arg);
}
}