From afcb731d18095cdcd229eb773162e5880a691362 Mon Sep 17 00:00:00 2001
From: Daniel Brall <git@bradan.eu>
Date: Fri, 10 Jun 2016 10:34:00 +0200
Subject: [PATCH] Fixed compile errors on linux (obvious programming faults).

---
 Engine/lib/collada/src/dae/daeMetaGroup.cpp | 2 +-
 Engine/lib/convexDecomp/NvHashMap.h         | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Engine/lib/collada/src/dae/daeMetaGroup.cpp b/Engine/lib/collada/src/dae/daeMetaGroup.cpp
index 0beb67151..f51703461 100644
--- a/Engine/lib/collada/src/dae/daeMetaGroup.cpp
+++ b/Engine/lib/collada/src/dae/daeMetaGroup.cpp
@@ -31,7 +31,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
 	(void)offset;
 	daeString nm = child->getElementName();
 	if ( findChild( nm ) == NULL ) {
-		return false;
+		return NULL;
 	}
 	daeElementRef el;
 
diff --git a/Engine/lib/convexDecomp/NvHashMap.h b/Engine/lib/convexDecomp/NvHashMap.h
index 3d57da0df..c8dfd7877 100644
--- a/Engine/lib/convexDecomp/NvHashMap.h
+++ b/Engine/lib/convexDecomp/NvHashMap.h
@@ -692,9 +692,6 @@ namespace CONVEX_DECOMPOSITION
 				mCapacity = t.mCapacity;
 
 				copy(mData,t.mData,t.mSize);
-				mSize = t.mSize;
-
-				return;
 			}
 			else
 			{
@@ -1521,7 +1518,7 @@ namespace CONVEX_DECOMPOSITION
 			NX_INLINE const Entry *find(const Key &k) const
 			{
 				if(!mHash.size())
-					return false;
+					return NULL;
 
 				NxU32 h = hash(k);
 				NxU32 index = mHash[h];