mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-24 03:24:32 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix method name for custom callable

Browse source
This commit is contained in:
Mansur Isaev 2024-05-25 08:01:34 +04:00
parent b7feebefab
commit e88095ed8f
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.ref = Ref<RefCounted>(Object::cast_to<RefCounted>(object));
} }
do_op.type = Operation::TYPE_METHOD; do_op.type = Operation::TYPE_METHOD;
do_op.name = p_callable.get_method(); // There's no `get_method()` for custom callables, so use `operator String()` instead.
if (do_op.name == StringName()) { if (p_callable.is_custom()) {
// There's no `get_method()` for custom callables, so use `operator String()` instead.
do_op.name = static_cast<String>(p_callable); 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); 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.type = Operation::TYPE_METHOD;
undo_op.force_keep_in_merge_ends = force_keep_in_merge_ends; undo_op.force_keep_in_merge_ends = force_keep_in_merge_ends;
undo_op.name = p_callable.get_method(); // There's no `get_method()` for custom callables, so use `operator String()` instead.
if (undo_op.name == StringName()) { if (p_callable.is_custom()) {
// There's no `get_method()` for custom callables, so use `operator String()` instead.
undo_op.name = static_cast<String>(p_callable); 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); actions.write[current_action + 1].undo_ops.push_back(undo_op);