From 8250e4728d7ed371a91aec948d04fecec3ed838a Mon Sep 17 00:00:00 2001 From: OTHGMars Date: Mon, 9 Jun 2014 14:58:45 -0400 Subject: [PATCH] Mount Process Order Fix 1 Added a controlling object check to GameBase::onMount() so mounted objects will process after objects controlling them. --- Engine/source/T3D/gameBase/gameBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/T3D/gameBase/gameBase.cpp b/Engine/source/T3D/gameBase/gameBase.cpp index baede5c49..7cc745c11 100644 --- a/Engine/source/T3D/gameBase/gameBase.cpp +++ b/Engine/source/T3D/gameBase/gameBase.cpp @@ -590,7 +590,7 @@ void GameBase::onMount( SceneObject *obj, S32 node ) // Are we mounting to a GameBase object? GameBase *gbaseObj = dynamic_cast( obj ); - if ( gbaseObj && gbaseObj->getControlObject() != this ) + if ( gbaseObj && gbaseObj->getControlObject() != this && gbaseObj->getControllingObject() != this) processAfter( gbaseObj ); if (!isGhost()) {