forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't panic when attempting to set shader defs from an asset that hasn't loaded yet (#1035)

Browse Source 
Don't panic when attempting to set shader defs from an asset that hasn't loaded yet
This commit is contained in:
James R 2020-12-09 18:34:22 -06:00 committed by GitHub
parent 7ab0eeece0
commit 4a5bcccde2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/bevy_render/src/shader/shader_defs.rs
View File

@ -98,14 +98,16 @@ pub fn asset_shader_defs_system<T: Asset>(
T: ShaderDefs + Send + Sync + 'static, T: ShaderDefs + Send + Sync + 'static,
{ {
for (asset_handle, mut render_pipelines) in query.iter_mut() { for (asset_handle, mut render_pipelines) in query.iter_mut() {
let shader_defs = assets.get(asset_handle).unwrap(); if let Some(asset_handle) = assets.get(asset_handle) {
for shader_def in shader_defs.iter_shader_defs() { let shader_defs = asset_handle;
for render_pipeline in render_pipelines.pipelines.iter_mut() { for shader_def in shader_defs.iter_shader_defs() {
render_pipeline for render_pipeline in render_pipelines.pipelines.iter_mut() {
.specialization render_pipeline
.shader_specialization .specialization
.shader_defs .shader_specialization
.insert(shader_def.to_string()); .shader_defs
.insert(shader_def.to_string());
}
} }
} }
} }