Browse Source

Mount Process Order Fix 1
Added a controlling object check to GameBase::onMount() so mounted objects will process after objects controlling them.

OTHGMars 11 years ago
parent
commit
8250e4728d
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Engine/source/T3D/gameBase/gameBase.cpp

+ 1 - 1
Engine/source/T3D/gameBase/gameBase.cpp

@@ -590,7 +590,7 @@ void GameBase::onMount( SceneObject *obj, S32 node )
    // Are we mounting to a GameBase object?
    // Are we mounting to a GameBase object?
    GameBase *gbaseObj = dynamic_cast<GameBase*>( obj );
    GameBase *gbaseObj = dynamic_cast<GameBase*>( obj );
 
 
-   if ( gbaseObj && gbaseObj->getControlObject() != this )
+   if ( gbaseObj && gbaseObj->getControlObject() != this && gbaseObj->getControllingObject() != this)
       processAfter( gbaseObj );
       processAfter( gbaseObj );
 
 
    if (!isGhost()) {
    if (!isGhost()) {