Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GPUParticles2D/3D speed scale on ENTER_TREE #75398

Merged
merged 1 commit into from
Mar 28, 2023

Conversation

newobj
Copy link
Contributor

@newobj newobj commented Mar 27, 2023

Fixes #75218

Pause notifications are not sent when a node is added as a child. So GPUParticles2D/3D should also obey its can_process status on ENTER_TREE, not just PAUSED/UNPAUSED.

Warning: This is my first PR for Godot :)

For GPUParticles2D:

Before:
Particles when running scene w/ disabled parent + inherit
anim

After:
No particles when running scene w/ disabled parent + inherit
image

For GPUParticles3D:

Before:
Running, ignoring inheritance of disabled:
anim-before

After:
Running, obeying inheritance properly:
anim-after

@Calinou
Copy link
Member

Calinou commented Mar 27, 2023

Can you check if the same issue occurs with GPUParticles3D? There's a fair chance it's impacted by the bug mentioned in #75218.

@Calinou Calinou added this to the 4.1 milestone Mar 27, 2023
@newobj
Copy link
Contributor Author

newobj commented Mar 27, 2023

Can you check if the same issue occurs with GPUParticles3D? There's a fair chance it's impacted by the bug mentioned in #75218.

Good point. Will do.

Fix for godotengine#75218

Pause notifications are not sent when a node is added as a child. So GPUParticles2D should also obey its can_process status on ENTER_TREE, not just PAUSED/UNPAUSED.
@newobj newobj requested a review from a team as a code owner March 27, 2023 20:25
@newobj newobj changed the title Update GPUParticles2D speed scale on ENTER_TREE Update GPUParticles2D/3D speed scale on ENTER_TREE Mar 27, 2023
@newobj
Copy link
Contributor Author

newobj commented Mar 27, 2023

Updated w/ fix for GPUParticles3D as well. (cc: @Calinou)

I squashed my commit for GPUParticles3D then pushed. Was that good for the workflow? Or should I have pushed an additional commit into my branch? Thanks, let me know.

@KoBeWi
Copy link
Member

KoBeWi commented Mar 27, 2023

I squashed my commit for GPUParticles3D then pushed. Was that good for the workflow?

Yes.

@YuriSizov YuriSizov merged commit 1222d35 into godotengine:master Mar 28, 2023
@YuriSizov
Copy link
Contributor

Thanks! And congrats on your first merged pull request!

@newobj newobj deleted the issue-75218 branch March 28, 2023 15:19
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GPUParticles2D Ignore Parent's "Disabled" Process Mode When Running Game
4 participants