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.

Sign up for GitHub

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

Jump to bottom

fix custom shader imports #10030

Merged
merged 3 commits into from
Oct 6, 2023
Merged

fix custom shader imports #10030

merged 3 commits into from
Oct 6, 2023

Conversation

robtfm
Copy link
Contributor

@robtfm robtfm commented Oct 5, 2023

Objective

assets v2 broke custom shader imports. fix them

Solution

store handles of any file dependencies in the Shader to avoid them being immediately dropped.
also added a use into the shader_material example so that it'll be harder to break support in future.

@robtfm robtfm added C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen labels Oct 5, 2023
@robtfm robtfm added this to the 0.12 milestone Oct 5, 2023
@alice-i-cecile alice-i-cecile added the A-Assets Load files from disk to use for things like images, models, and sounds label Oct 5, 2023
alice-i-cecile
alice-i-cecile approved these changes Oct 5, 2023
View reviewed changes
Copy link
Member

@alice-i-cecile alice-i-cecile left a comment

Choose a reason for hiding this comment

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

Fix makes sense to me. Nothing blocking, but improving the variable name would be nice.

superdump
superdump requested changes Oct 5, 2023
View reviewed changes
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.

Very minor nit, otherwise approved. Thanks for putting this together!

@alice-i-cecile alice-i-cecile 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 Oct 5, 2023
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Oct 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 5, 2023
@superdump superdump added this pull request to the merge queue Oct 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 5, 2023
@james7132 james7132 added this pull request to the merge queue Oct 6, 2023
Merged via the queue into bevyengine:main with commit 30cb95d Oct 6, 2023
22 checks passed
@JMS55 JMS55 mentioned this pull request Oct 7, 2023
Closed
regnarock pushed a commit to regnarock/bevy that referenced this pull request Oct 13, 2023
@robtfm
fix custom shader imports (bevyengine#10030)
8d44414 
# Objective

assets v2 broke custom shader imports. fix them

## Solution

store handles of any file dependencies in the `Shader` to avoid them
being immediately dropped.
also added a use into the `shader_material` example so that it'll be
harder to break support in future.
ameknite pushed a commit to ameknite/bevy that referenced this pull request Nov 6, 2023
@robtfm @ameknite
fix custom shader imports (bevyengine#10030)
b417d73 
# Objective

assets v2 broke custom shader imports. fix them

## Solution

store handles of any file dependencies in the `Shader` to avoid them
being immediately dropped.
also added a use into the `shader_material` example so that it'll be
harder to break support in future.
rdrpenguin04 pushed a commit to rdrpenguin04/bevy that referenced this pull request Jan 9, 2024
@robtfm
fix custom shader imports (bevyengine#10030)
7ed48b1 
# Objective

assets v2 broke custom shader imports. fix them

## Solution

store handles of any file dependencies in the `Shader` to avoid them
being immediately dropped.
also added a use into the `shader_material` example so that it'll be
harder to break support in future.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alice-i-cecile alice-i-cecile alice-i-cecile approved these changes

@superdump superdump superdump approved these changes

@james7132 james7132 james7132 approved these changes

Assignees
No one assigned
Labels
A-Assets Load files from disk to use for things like images, models, and sounds 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
Milestone
0.12
Development

Successfully merging this pull request may close these issues.
4 participants
@robtfm @superdump @james7132 @alice-i-cecile