Skip to content

Commit 4a5bccc

Browse files
authored
Don't panic when attempting to set shader defs from an asset that hasn't loaded yet (#1035)
Don't panic when attempting to set shader defs from an asset that hasn't loaded yet
1 parent 7ab0eee commit 4a5bccc

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

crates/bevy_render/src/shader/shader_defs.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,16 @@ pub fn asset_shader_defs_system<T: Asset>(
9898
T: ShaderDefs + Send + Sync + 'static,
9999
{
100100
for (asset_handle, mut render_pipelines) in query.iter_mut() {
101-
let shader_defs = assets.get(asset_handle).unwrap();
102-
for shader_def in shader_defs.iter_shader_defs() {
103-
for render_pipeline in render_pipelines.pipelines.iter_mut() {
104-
render_pipeline
105-
.specialization
106-
.shader_specialization
107-
.shader_defs
108-
.insert(shader_def.to_string());
101+
if let Some(asset_handle) = assets.get(asset_handle) {
102+
let shader_defs = asset_handle;
103+
for shader_def in shader_defs.iter_shader_defs() {
104+
for render_pipeline in render_pipelines.pipelines.iter_mut() {
105+
render_pipeline
106+
.specialization
107+
.shader_specialization
108+
.shader_defs
109+
.insert(shader_def.to_string());
110+
}
109111
}
110112
}
111113
}

0 commit comments

Comments
 (0)