2
0
Эх сурвалжийг харах

Merge pull request #209 from Azaezel/alpha40_ScopeStackShenanigans

adress #203
Brian Roberts 5 жил өмнө
parent
commit
b98d0a946b

+ 5 - 3
Engine/source/sfx/sfxWorld.h

@@ -361,9 +361,11 @@ void SFXWorld< NUM_DIMENSIONS, Object >::_onScopeIn( Object object )
    F32 sortValue = _getSortValue( object );
    while( iter != mScopeStack.end() && iter->mSortValue >= sortValue )
       ++ iter;
-      
-   // Insert the object into the stack.
-   
+   // If the object is already on the scope stack, do not add it again
+   S32 index = _findScope(object);
+   if (index != -1)
+      return;
+   // Insert the object into the stack.   
    mScopeStack.insert( iter, Scope( sortValue, object ) );
 }