From 00bc55370d1d48ad3c7caf1dafc38640260d849b Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Fri, 18 Dec 2015 14:19:28 +0100
Subject: [PATCH] Added error check in Collision.cpp

---
 src/Engine/Collision/Collision.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp
index d076d1c2..c4af6258 100644
--- a/src/Engine/Collision/Collision.cpp
+++ b/src/Engine/Collision/Collision.cpp
@@ -252,6 +252,9 @@ bool GetEntityBox(World* world, ComponentWrapper& AABBComponent, AABB& outBox)
     glm::vec3 mini = outBox.MinCorner();
     glm::vec3 maxi = outBox.MaxCorner();
 
+    if (modelRes == nullptr) {
+        return false;
+    }
     glm::mat4 modelMatrix = modelRes->m_Matrix *
         glm::translate(glm::mat4(), (glm::vec3)cTrans["Position"]) *
         glm::scale((glm::vec3)cTrans["Scale"]);