summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-02-12 22:05:14 +0100
committerGitHub <noreply@github.com>2019-02-12 22:05:14 +0100
commitcc76f3c71d6d645ff454d142237985421439f722 (patch)
tree81eb58e1f6ad09b4af5e89dfbaa3dd58d9df94c4
parentb8319e7c60178b16a9e94ffdfdbe06dac26b3217 (diff)
parent5e28fa53c474b0bbb27ecb45973b846233f8b6d1 (diff)
Merge pull request #25828 from samH-FIT/particle_fix
Fixes issue where ZIndex of converted CPUParticles2D is reset to zero
-rw-r--r--editor/plugins/particles_2d_editor_plugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/plugins/particles_2d_editor_plugin.cpp b/editor/plugins/particles_2d_editor_plugin.cpp
index a944674cbd..bb7d50a9c1 100644
--- a/editor/plugins/particles_2d_editor_plugin.cpp
+++ b/editor/plugins/particles_2d_editor_plugin.cpp
@@ -91,6 +91,7 @@ void Particles2DEditorPlugin::_menu_callback(int p_idx) {
cpu_particles->set_transform(particles->get_transform());
cpu_particles->set_visible(particles->is_visible());
cpu_particles->set_pause_mode(particles->get_pause_mode());
+ cpu_particles->set_z_index(particles->get_z_index());
EditorNode::get_singleton()->get_scene_tree_dock()->replace_node(particles, cpu_particles, false);