diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-03-27 13:47:15 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 13:47:15 -0300 |
| commit | 307b1b3a5835ecdb477859785c673a07e248f904 (patch) | |
| tree | cc0123bc7111e48775331d500452875c278cc13b /scene/2d/cpu_particles_2d.cpp | |
| parent | f48aeeeeefa73d4c6e58ee2934eaf16bc0408df0 (diff) | |
| parent | d1acbbce7f123c2b5fccdefc6417787dc91b6ced (diff) | |
| download | redot-engine-307b1b3a5835ecdb477859785c673a07e248f904.tar.gz | |
Merge pull request #37340 from reduz/rename-3d-nodes
Make 2D and 3D node names more explicit
Diffstat (limited to 'scene/2d/cpu_particles_2d.cpp')
| -rw-r--r-- | scene/2d/cpu_particles_2d.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index 3b8a81d2ca..8678e5a1f4 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -31,8 +31,8 @@ #include "cpu_particles_2d.h" #include "core/core_string_names.h" -#include "scene/2d/canvas_item.h" -#include "scene/2d/particles_2d.h" +#include "scene/2d/gpu_particles_2d.h" +#include "scene/main/canvas_item.h" #include "scene/resources/particles_material.h" #include "servers/visual_server.h" @@ -1144,7 +1144,7 @@ void CPUParticles2D::_notification(int p_what) { void CPUParticles2D::convert_from_particles(Node *p_particles) { - Particles2D *particles = Object::cast_to<Particles2D>(p_particles); + GPUParticles2D *particles = Object::cast_to<GPUParticles2D>(p_particles); ERR_FAIL_COND_MSG(!particles, "Only Particles2D nodes can be converted to CPUParticles2D."); set_emitting(particles->is_emitting()); |