From 913fe1dcbf90ae18e0c6c238a92d279948dad29d Mon Sep 17 00:00:00 2001
From: Sergio Ricardo Zerbetto Masson <sergioze@microsoft.com>
Date: Thu, 21 Jul 2022 11:15:51 -0300
Subject: [PATCH 1/2] Added handle for undefined vertex buffers on
 RecordVertexBuffer

---
 Plugins/NativeEngine/Source/NativeEngine.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Plugins/NativeEngine/Source/NativeEngine.cpp b/Plugins/NativeEngine/Source/NativeEngine.cpp
index 795297fc3..377a17fa8 100644
--- a/Plugins/NativeEngine/Source/NativeEngine.cpp
+++ b/Plugins/NativeEngine/Source/NativeEngine.cpp
@@ -608,6 +608,12 @@ namespace Babylon
     void NativeEngine::RecordVertexBuffer(const Napi::CallbackInfo& info)
     {
         VertexArray* vertexArray = info[0].As<Napi::Pointer<VertexArray>>().Get();
+        
+        auto vertexBufferValue = info[1];
+        
+        if (vertexBufferValue.IsUndefined())
+            return;
+
         VertexBuffer* vertexBuffer = info[1].As<Napi::Pointer<VertexBuffer>>().Get();
         const uint32_t location = info[2].As<Napi::Number>().Uint32Value();
         const uint32_t byteOffset = info[3].As<Napi::Number>().Uint32Value();

From 57dd45ec0e693b989462ba51757974efbdaadf03 Mon Sep 17 00:00:00 2001
From: Sergio Ricardo Zerbetto Masson <sergioze@microsoft.com>
Date: Thu, 21 Jul 2022 11:25:29 -0300
Subject: [PATCH 2/2] Small code clean up

---
 Plugins/NativeEngine/Source/NativeEngine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/NativeEngine/Source/NativeEngine.cpp b/Plugins/NativeEngine/Source/NativeEngine.cpp
index 377a17fa8..8c2469e7c 100644
--- a/Plugins/NativeEngine/Source/NativeEngine.cpp
+++ b/Plugins/NativeEngine/Source/NativeEngine.cpp
@@ -614,7 +614,7 @@ namespace Babylon
         if (vertexBufferValue.IsUndefined())
             return;
 
-        VertexBuffer* vertexBuffer = info[1].As<Napi::Pointer<VertexBuffer>>().Get();
+        VertexBuffer* vertexBuffer = vertexBufferValue.As<Napi::Pointer<VertexBuffer>>().Get();
         const uint32_t location = info[2].As<Napi::Number>().Uint32Value();
         const uint32_t byteOffset = info[3].As<Napi::Number>().Uint32Value();
         const uint32_t byteStride = info[4].As<Napi::Number>().Uint32Value();