TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1644 from Bradan/development

Browse source 
Fixed compile errors on linux (obvious programming faults).
This commit is contained in:
Areloch 2016-06-19 21:38:27 -05:00 • committed by GitHub
commit 88f0318baa
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/lib/collada/src/dae/daeMetaGroup.cpp
View file

@ -31,7 +31,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
(void)offset; (void)offset;
daeString nm = child->getElementName(); daeString nm = child->getElementName();
if ( findChild( nm ) == NULL ) { if ( findChild( nm ) == NULL ) {
return false; return NULL;
} }
daeElementRef el; daeElementRef el;

5
Engine/lib/convexDecomp/NvHashMap.h
View file

@ -692,9 +692,6 @@ namespace CONVEX_DECOMPOSITION
mCapacity = t.mCapacity; mCapacity = t.mCapacity;
copy(mData,t.mData,t.mSize); copy(mData,t.mData,t.mSize);
mSize = t.mSize;
return;
} }
else else
{ {
@ -1521,7 +1518,7 @@ namespace CONVEX_DECOMPOSITION
NX_INLINE const Entry *find(const Key &k) const NX_INLINE const Entry *find(const Key &k) const
{ {
if(!mHash.size()) if(!mHash.size())
return false; return NULL;
NxU32 h = hash(k); NxU32 h = hash(k);
NxU32 index = mHash[h]; NxU32 index = mHash[h];