godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #29974 from clayjohn/particles_restart

Browse Source 
Properly set emitting when particles restart
This commit is contained in:
Rémi Verschelde
2019-06-24 13:48:56 +02:00
committed by GitHub
parent 1cb2b682ab 64ecc8a5a3
commit 25022a1d89
13 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/particles_2d_editor_plugin.cpp
View File

@@ -102,6 +102,10 @@ void Particles2DEditorPlugin::_menu_callback(int p_idx) {
ur->commit_action();
} break;
case MENU_RESTART: {
particles->restart();
}
}
}
@@ -380,6 +384,8 @@ Particles2DEditorPlugin::Particles2DEditorPlugin(EditorNode *p_node) {
// menu->get_popup()->add_item(TTR("Clear Emission Mask"), MENU_CLEAR_EMISSION_MASK);
menu->get_popup()->add_separator();
menu->get_popup()->add_item(TTR("Convert to CPUParticles"), MENU_OPTION_CONVERT_TO_CPU_PARTICLES);
menu->get_popup()->add_separator();
menu->get_popup()->add_item(TTR("Restart"), MENU_RESTART);
menu->set_text(TTR("Particles"));
menu->set_switch_on_hover(true);
toolbar->add_child(menu);