diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-04 13:34:35 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-04 13:34:35 +0100 |
| commit | 95085cdcdb16effeb25a18d02b98eab0874361e7 (patch) | |
| tree | b038352ceabdee95f06aa456f2857724863bc459 /editor/plugins/gpu_particles_3d_editor_plugin.cpp | |
| parent | 790d051ff19a9b6e4ddbd7995a7e998dfcbd850e (diff) | |
| parent | c1cce6bb69320cb91c98445f35e6c807390b966a (diff) | |
| download | redot-engine-95085cdcdb16effeb25a18d02b98eab0874361e7.tar.gz | |
Merge pull request #89121 from KoBeWi/replace_node_type
Fix undo action names for node replacement
Diffstat (limited to 'editor/plugins/gpu_particles_3d_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/gpu_particles_3d_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.cpp b/editor/plugins/gpu_particles_3d_editor_plugin.cpp index 88c9df7103..04b0a8aa26 100644 --- a/editor/plugins/gpu_particles_3d_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_3d_editor_plugin.cpp @@ -279,7 +279,7 @@ void GPUParticles3DEditor::_menu_option(int p_option) { cpu_particles->set_process_mode(node->get_process_mode()); EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton(); - ur->create_action(TTR("Convert to CPUParticles3D")); + ur->create_action(TTR("Convert to CPUParticles3D"), UndoRedo::MERGE_DISABLE, node); SceneTreeDock::get_singleton()->replace_node(node, cpu_particles); ur->commit_action(false); |