godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix method name for custom callable"

Browse Source 
This reverts commit e88095ed8f.

Fixes #92695.
This commit is contained in:
Rémi Verschelde 2024-06-11 11:02:03 +02:00
parent 4223444d87
commit 94929439b6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/object/undo_redo.cpp
View File

@ -159,11 +159,10 @@ 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;
// There's no `get_method()` for custom callables, so use `operator String()` instead. do_op.name = p_callable.get_method();
if (p_callable.is_custom()) { if (do_op.name == StringName()) {
// 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);
@ -191,11 +190,10 @@ 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;
// There's no `get_method()` for custom callables, so use `operator String()` instead. undo_op.name = p_callable.get_method();
if (p_callable.is_custom()) { if (undo_op.name == StringName()) {
// 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);