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 bevy_pbr shader function name #10423

Merged
merged 1 commit into from
Nov 7, 2023

Conversation

kayhhh
Copy link
Contributor

@kayhhh kayhhh commented Nov 7, 2023

Objective

Fix a shader error that happens when using pbr morph targets.

Solution

Fix the function name in the prepass.wgsl shader, which is incorrectly prefixed with morph:: (added in 61bad4e#diff-97e4500f0a36bc6206d7b1490c8dd1a69459ee39dc6822eb9b2f7b160865f49fR42).

This section of the shader is only enabled when using morph targets, so it seems like there are no tests / examples using it?

Copy link
Contributor

github-actions bot commented Nov 7, 2023

Welcome, new contributor!

Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨

@alice-i-cecile alice-i-cecile added this to the 0.12.1 milestone Nov 7, 2023
@alice-i-cecile alice-i-cecile added C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen labels Nov 7, 2023
@nicopap
Copy link
Contributor

nicopap commented Nov 7, 2023

You can test the interaction between prepass and morph targets with this example file:

https://gist.github.com/nicopap/bf97174f1496df4854909d672eb2cc0f

Can you confirm it works?

Copy link
Contributor

@superdump superdump left a comment

Choose a reason for hiding this comment

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

Given morph_vertex is a local function, this definitely looks like it fixes a bug.

@james7132 james7132 added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Nov 7, 2023
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Nov 7, 2023
Merged via the queue into bevyengine:main with commit c98481a Nov 7, 2023
25 checks passed
robtfm pushed a commit to robtfm/bevy that referenced this pull request Nov 13, 2023
# Objective

Fix a shader error that happens when using pbr morph targets.

## Solution

Fix the function name in the `prepass.wgsl` shader, which is incorrectly
prefixed with `morph::` (added in
bevyengine@61bad4e#diff-97e4500f0a36bc6206d7b1490c8dd1a69459ee39dc6822eb9b2f7b160865f49fR42).

This section of the shader is only enabled when using morph targets, so
it seems like there are no tests / examples using it?
cart pushed a commit that referenced this pull request Nov 30, 2023
# Objective

Fix a shader error that happens when using pbr morph targets.

## Solution

Fix the function name in the `prepass.wgsl` shader, which is incorrectly
prefixed with `morph::` (added in
61bad4e#diff-97e4500f0a36bc6206d7b1490c8dd1a69459ee39dc6822eb9b2f7b160865f49fR42).

This section of the shader is only enabled when using morph targets, so
it seems like there are no tests / examples using it?
rdrpenguin04 pushed a commit to rdrpenguin04/bevy that referenced this pull request Jan 9, 2024
# Objective

Fix a shader error that happens when using pbr morph targets.

## Solution

Fix the function name in the `prepass.wgsl` shader, which is incorrectly
prefixed with `morph::` (added in
bevyengine@61bad4e#diff-97e4500f0a36bc6206d7b1490c8dd1a69459ee39dc6822eb9b2f7b160865f49fR42).

This section of the shader is only enabled when using morph targets, so
it seems like there are no tests / examples using it?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants