diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-05 07:59:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 07:59:30 +0100 |
| commit | 4c63772f549bd6e04261720d105facb5996e9dbf (patch) | |
| tree | 6b9ac3028842f87f36073ede12998188d46e0f02 /servers/visual/visual_server_canvas.cpp | |
| parent | 7438093562006e90394f0099bb829cd3c246c5fa (diff) | |
| parent | 85ce4a67ed37a2b38bc6d9e3f0211a9b73a8516d (diff) | |
Merge pull request #22622 from JFonS/fix_particle_animation
Remove animation loop from ParticlesMaterial + improvements to CPUParticles2D
Diffstat (limited to 'servers/visual/visual_server_canvas.cpp')
| -rw-r--r-- | servers/visual/visual_server_canvas.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index 3c8088c75c..84b7504ad4 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -776,7 +776,7 @@ void VisualServerCanvas::canvas_item_add_mesh(RID p_item, const RID &p_mesh, RID canvas_item->commands.push_back(m); } -void VisualServerCanvas::canvas_item_add_particles(RID p_item, RID p_particles, RID p_texture, RID p_normal, int p_h_frames, int p_v_frames) { +void VisualServerCanvas::canvas_item_add_particles(RID p_item, RID p_particles, RID p_texture, RID p_normal) { Item *canvas_item = canvas_item_owner.getornull(p_item); ERR_FAIL_COND(!canvas_item); @@ -786,8 +786,6 @@ void VisualServerCanvas::canvas_item_add_particles(RID p_item, RID p_particles, part->particles = p_particles; part->texture = p_texture; part->normal_map = p_normal; - part->h_frames = p_h_frames; - part->v_frames = p_v_frames; //take the chance and request processing for them, at least once until they become visible again VSG::storage->particles_request_process(p_particles); |