maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #33045 from nekomatata/cpu-particle-uninitialized-member

Browse source 
Fixed emitting not initialized correctly in cpu particles 2d/3d
This commit is contained in:
Rémi Verschelde 2019-10-25 07:24:36 +02:00 committed by GitHub
parent b1e4a62ee0 1e0f37a70f
commit 66ccdebbb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/2d/cpu_particles_2d.cpp
View file

@ -260,8 +260,7 @@ void CPUParticles2D::restart() {
inactive_time = 0;
frame_remainder = 0;
cycle = 0;
set_emitting(true);
emitting = false;
{
int pc = particles.size();
@ -271,6 +270,8 @@ void CPUParticles2D::restart() {
w[i].active = false;
}
}
set_emitting(true);
}
void CPUParticles2D::set_direction(Vector2 p_direction) {
@ -1422,6 +1423,7 @@ CPUParticles2D::CPUParticles2D() {
frame_remainder = 0;
cycle = 0;
redraw = false;
emitting = false;
mesh = VisualServer::get_singleton()->mesh_create();
multimesh = VisualServer::get_singleton()->multimesh_create();

6
scene/3d/cpu_particles.cpp
View file

@ -240,8 +240,7 @@ void CPUParticles::restart() {
inactive_time = 0;
frame_remainder = 0;
cycle = 0;
set_emitting(true);
emitting = false;
{
int pc = particles.size();
@ -251,6 +250,8 @@ void CPUParticles::restart() {
w[i].active = false;
}
}
set_emitting(true);
}
void CPUParticles::set_direction(Vector3 p_direction) {
@ -1494,6 +1495,7 @@ CPUParticles::CPUParticles() {
frame_remainder = 0;
cycle = 0;
redraw = false;
emitting = false;
set_notify_transform(true);