From 253c2317880235fa2ebac72a51ddee63333cf896 Mon Sep 17 00:00:00 2001 From: Mike Welsh Date: Sun, 11 Oct 2020 01:18:01 -0700 Subject: [PATCH] webgl: Don't panic when trying to draw unregistered bitmap Avoids a panic in #1248. --- render/webgl/src/lib.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/render/webgl/src/lib.rs b/render/webgl/src/lib.rs index 9cc1d54d2..0a5ea6c1c 100644 --- a/render/webgl/src/lib.rs +++ b/render/webgl/src/lib.rs @@ -1048,12 +1048,14 @@ impl RenderBackend for WebGlRenderBackend { ); } DrawType::Bitmap(bitmap) => { - let texture = &self - .textures - .iter() - .find(|(id, _tex)| *id == bitmap.id) - .unwrap() - .1; + let texture = if let Some(texture) = + self.textures.iter().find(|(id, _tex)| *id == bitmap.id) + { + &texture.1 + } else { + // Bitmap not registered + continue; + }; program.uniform_matrix3fv( &self.gl,