From dea57b4872cc4912df0d5d8c9bc047297969245c Mon Sep 17 00:00:00 2001
From: William Moberg <william.moberg@live.se>
Date: Mon, 14 Mar 2016 01:00:58 +0100
Subject: [PATCH] Fixes after merge.

---
 src/Engine/Collision/Collision.cpp     | 2 +-
 src/Engine/Collision/TriggerSystem.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp
index 1ecdccec..3c699a26 100644
--- a/src/Engine/Collision/Collision.cpp
+++ b/src/Engine/Collision/Collision.cpp
@@ -570,7 +570,7 @@ Output AABBvsTriangles(const AABB& box,
     bool resolveCollision)
 {
     if (!modelVertices) {
-        return false;
+        return Output::OutSeparated;
     }
     bool intersect = false;
     Output out = Output::OutContained;
diff --git a/src/Engine/Collision/TriggerSystem.cpp b/src/Engine/Collision/TriggerSystem.cpp
index c9bc18dc..e6172e5f 100644
--- a/src/Engine/Collision/TriggerSystem.cpp
+++ b/src/Engine/Collision/TriggerSystem.cpp
@@ -38,8 +38,8 @@ void TriggerSystem::UpdateComponent(EntityWrapper& triggerEntity, ComponentWrapp
                 ? Collision::Output::OutContained 
                 : Collision::AABBvsTrianglesWContainment(
                 colliderBox,
-                triggerModel->Vertices(),
-                triggerModel->m_Indices,
+                triggerModel->CollisionVertices(),
+                triggerModel->CollisionIndices(),
                 triggerModelMat);
 
             if (colliderFitsInTrigger && Collision::AABBVsAABB(completelyInsideBox, colliderBox) && out == Collision::Output::OutContained) {