diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-11 11:02:03 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-11 11:02:03 +0200 |
| commit | 94929439b6b61c624c0f5342ef7d4ae8d8a26c32 (patch) | |
| tree | 2dfb8041cdc3a58486ea8891461dfb501073fb8e /core/object/undo_redo.cpp | |
| parent | 4223444d87e125534c72d09c4f45ed490b0c5e5e (diff) | |
| download | redot-engine-94929439b6b61c624c0f5342ef7d4ae8d8a26c32.tar.gz | |
Revert "Fix method name for custom callable"
This reverts commit e88095ed8fbc7039c1724e51ee84f154fdf49305.
Fixes #92695.
Diffstat (limited to 'core/object/undo_redo.cpp')
| -rw-r--r-- | core/object/undo_redo.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/object/undo_redo.cpp b/core/object/undo_redo.cpp index 0f7884305a..4d67cd930e 100644 --- a/core/object/undo_redo.cpp +++ b/core/object/undo_redo.cpp @@ -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.type = Operation::TYPE_METHOD; - // There's no `get_method()` for custom callables, so use `operator String()` instead. - if (p_callable.is_custom()) { + 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. 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); @@ -191,11 +190,10 @@ 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; - // There's no `get_method()` for custom callables, so use `operator String()` instead. - if (p_callable.is_custom()) { + 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. 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); |