Skip to content

Commit 5c00d0a

Browse files
committed
Merge pull request #94371 from KoBeWi/insane_particle_unification_😱
Unify particle editors
2 parents 47d45f1 + a4d724b commit 5c00d0a

14 files changed

+1192
-1820
lines changed

‎doc/classes/CPUParticles3D.xml

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<link title="Particle systems (3D)">$DOCS_URL/tutorials/3d/particles/index.html</link>
1212
</tutorials>
1313
<methods>
14+
<method name="capture_aabb" qualifiers="const">
15+
<return type="AABB" />
16+
<description>
17+
Returns the axis-aligned bounding box that contains all the particles that are active in the current frame.
18+
</description>
19+
</method>
1420
<method name="convert_from_particles">
1521
<return type="void" />
1622
<param index="0" name="particles" type="Node" />

‎editor/editor_node.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -6737,10 +6737,6 @@ EditorNode::EditorNode() {
67376737
ED_SHORTCUT("editor/group_selected_nodes", TTR("Group Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | Key::G);
67386738
ED_SHORTCUT("editor/ungroup_selected_nodes", TTR("Ungroup Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::G);
67396739

6740-
// Used in the GPUParticles/CPUParticles 2D/3D editor plugins.
6741-
// The shortcut is Ctrl + R even on macOS, as Cmd + R is used to run the current scene on macOS.
6742-
ED_SHORTCUT("particles/restart_emission", TTR("Restart Emission"), KeyModifierMask::CTRL | Key::R);
6743-
67446740
FileAccess::set_backup_save(EDITOR_GET("filesystem/on_save/safe_save_on_backup_then_rename"));
67456741

67466742
_update_vsync_mode();

‎editor/plugins/cpu_particles_2d_editor_plugin.cpp

-309
This file was deleted.

0 commit comments

Comments
 (0)