TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into EngineAPI-Refactor

Browse source
This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 • committed by GitHub
commit 3a71c75596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1937 changed files with 102332 additions and 70549 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/util/scopeTracker.h
View file

@ -515,11 +515,11 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::updateObject( Object object )
while( !mPotentialScopeInObjects.empty() )
{
Object object = mPotentialScopeInObjects.last();
Object obj = mPotentialScopeInObjects.last();
mPotentialScopeInObjects.decrement();
if( Deref( object ).isInScope() )
_onScopeIn( object );
if( Deref(obj).isInScope() )
_onScopeIn(obj);
}
}
else