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

Fix MASS property particle shader bug #102143

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

MathdudeMan
Copy link
Contributor

@MathdudeMan MathdudeMan commented Jan 29, 2025

MASS property bug in particle shaders fixed, raised in #102035.

@MathdudeMan MathdudeMan requested a review from a team as a code owner January 29, 2025 02:06
@AThousandShips AThousandShips added bug topic:shaders cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Jan 29, 2025
@AThousandShips AThousandShips added this to the 4.4 milestone Jan 29, 2025
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. I don't know much about how MASS should behave. But this matches the code that was in Godot 2.x (Godot 3.x didn't have attractors) which I assume matches how the MASS property is supposed to behave.

Internally mass defaults to 1.0, so this won't change existing projects. If anyone attempted to use MASS before the shader would fail to compile. So there is no real risk of breaking anything by fixing this.

@Repiteo Repiteo merged commit 3ba6ac0 into godotengine:master Jan 29, 2025
19 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Jan 29, 2025

Thanks! Congratulations on your first merged contribution! 🎉

@akien-mga akien-mga changed the title Fix: Mass property particle shader bug Fix MASS property particle shader bug Feb 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release topic:shaders
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shader compilation error when defining the MASS property to a Particle ShaderMaterial
4 participants