gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92350 from 4d49/undo-redo-fix-callable-name

Browse source 
Fix `UndoRedo` method name for custom `Callable`
This commit is contained in:
Rémi Verschelde 2024-05-28 15:49:26 +02:00
parent 760e30a4de e88095ed8f
commit 4808f24312
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/object/undo_redo.cpp
View file

@ -159,10 +159,11 @@ void UndoRedo::add_do_method(const Callable &p_callable) {
do_op.ref = Ref<RefCounted>(Object::cast_to<RefCounted>(object));
}
do_op.type = Operation::TYPE_METHOD;
do_op.name = p_callable.get_method();
if (do_op.name == StringName()) {
// There's no `get_method()` for custom callables, so use `operator String()` instead.
// There's no `get_method()` for custom callables, so use `operator String()` instead.
if (p_callable.is_custom()) {
do_op.name = static_cast<String>(p_callable);
} else {
do_op.name = p_callable.get_method();
}
actions.write[current_action + 1].do_ops.push_back(do_op);
@ -190,10 +191,11 @@ void UndoRedo::add_undo_method(const Callable &p_callable) {
}
undo_op.type = Operation::TYPE_METHOD;
undo_op.force_keep_in_merge_ends = force_keep_in_merge_ends;
undo_op.name = p_callable.get_method();
if (undo_op.name == StringName()) {
// There's no `get_method()` for custom callables, so use `operator String()` instead.
// There's no `get_method()` for custom callables, so use `operator String()` instead.
if (p_callable.is_custom()) {
undo_op.name = static_cast<String>(p_callable);
} else {
undo_op.name = p_callable.get_method();
}
actions.write[current_action + 1].undo_ops.push_back(undo_op);