From a2fc835df3d0d32892f725a15a808006b17393fa Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Thu, 24 Feb 2022 16:11:12 +0100
Subject: [PATCH] bevy_render: Hack around empty storage buffer problem

If there are no values, add a default one to avoid panics.
---
 crates/bevy_render/src/render_resource/storage_vec.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/bevy_render/src/render_resource/storage_vec.rs b/crates/bevy_render/src/render_resource/storage_vec.rs
index e1d20dc760de0d..0d5d71e0f0b5b8 100644
--- a/crates/bevy_render/src/render_resource/storage_vec.rs
+++ b/crates/bevy_render/src/render_resource/storage_vec.rs
@@ -8,7 +8,7 @@ use crate::renderer::{RenderDevice, RenderQueue};
 
 use super::Buffer;
 
-pub struct StorageVec<T: AsStd430> {
+pub struct StorageVec<T: AsStd430 + Default> {
     values: Vec<T>,
     scratch: Vec<u8>,
     storage_buffer: Option<Buffer>,
@@ -16,7 +16,7 @@ pub struct StorageVec<T: AsStd430> {
     item_size: usize,
 }
 
-impl<T: AsStd430> Default for StorageVec<T> {
+impl<T: AsStd430 + Default> Default for StorageVec<T> {
     fn default() -> Self {
         Self {
             values: Vec::new(),
@@ -30,7 +30,7 @@ impl<T: AsStd430> Default for StorageVec<T> {
     }
 }
 
-impl<T: AsStd430> StorageVec<T> {
+impl<T: AsStd430 + Default> StorageVec<T> {
     #[inline]
     pub fn storage_buffer(&self) -> Option<&Buffer> {
         self.storage_buffer.as_ref()
@@ -89,7 +89,7 @@ impl<T: AsStd430> StorageVec<T> {
 
     pub fn write_buffer(&mut self, device: &RenderDevice, queue: &RenderQueue) {
         if self.values.is_empty() {
-            return;
+            self.values.push(T::default());
         }
         self.reserve(self.values.len(), device);
         if let Some(storage_buffer) = &self.storage_buffer {