Răsfoiți Sursa

need to set state to ok post-load and pre-changesignal callback

AzaezelX 1 an în urmă
părinte
comite
5ff83138cf

+ 2 - 2
Engine/source/T3D/assets/ShapeAsset.cpp

@@ -417,9 +417,10 @@ U32 ShapeAsset::load()
       }
    }
 
+   mLoadedState = Ok;
+
    mChangeSignal.trigger();
 
-   mLoadedState = Ok;
    return mLoadedState;
 }
 
@@ -534,7 +535,6 @@ void ShapeAsset::onAssetRefresh(void)
       mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
 
    load();
-   //onAssetRefresh();
 }
 
 void ShapeAsset::SplitSequencePathAndName(String& srcPath, String& srcName)

+ 0 - 9
Engine/source/T3D/tsStatic.cpp

@@ -606,15 +606,6 @@ void TSStatic::onRemove()
    Parent::onRemove();
 }
 
-void TSStatic::_onResourceChanged(const Torque::Path& path)
-{
-   if (path != Path(mShapeName))
-      return;
-
-   _createShape();
-   _updateShouldTick();
-}
-
 void TSStatic::onShapeChanged()
 {
    _createShape();

+ 0 - 1
Engine/source/T3D/tsStatic.h

@@ -169,7 +169,6 @@ protected:
 
    void _renderNormals(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat);
 
-   void _onResourceChanged(const Torque::Path& path);
    void onShapeChanged();
 
    // ProcessObject