Kaynağa Gözat

Merge pull request #1525 from Azaezel/alpha41/lanceTheThread

fix crash with unclean exit
Brian Roberts 2 ay önce
ebeveyn
işleme
81504fb089
2 değiştirilmiş dosya ile 3 ekleme ve 2 silme
  1. 3 1
      Engine/source/T3D/player.cpp
  2. 0 1
      Engine/source/ts/tsThread.cpp

+ 3 - 1
Engine/source/T3D/player.cpp

@@ -4604,10 +4604,12 @@ void Player::onUnmount( SceneObject *obj, S32 node )
 
 void Player::unmount()
 {
+
    // Reset back to root position during dismount.  This copies what is
    // done on the server and corrects the fact that the RootAnim change
    // is not sent across to the client using the standard ActionMask.
-   setActionThread(PlayerData::RootAnim,true,false,false);
+   if (!isRemoved())
+      setActionThread(PlayerData::RootAnim,true,false,false);
 
    Parent::unmount();
 }

+ 0 - 1
Engine/source/ts/tsThread.cpp

@@ -534,7 +534,6 @@ void TSShapeInstance::destroyThread(TSThread * thread)
    delete mThreadList[i];
    mThreadList.erase(i);
    setDirty(AllDirtyMask);
-   checkScaleCurrentlyAnimated();
 }
 
 U32 TSShapeInstance::threadCount()