Merge pull request #1644 from Bradan/development

Fixed compile errors on linux (obvious programming faults).
GarageGames · Jun 20, 2016 · 88f0318 · 88f0318
2 parents 80dcf3e + afcb731
commit 88f0318
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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];