Browse Source

Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development

vvv-yeaf 3 years ago
parent
commit
049028480f

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

@@ -207,8 +207,9 @@ void ShapeAsset::initializeAsset()
    //Ensure our path is expando'd if it isn't already
    mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
 
-   mConstructorFilePath = getOwned() ? expandAssetFilePath(mConstructorFilePath) : mConstructorFilePath;
-
+   mConstructorFilePath = getOwned() ? expandAssetFilePath(mConstructorFileName) : mConstructorFilePath;
+   if (!Torque::FS::IsFile(mConstructorFilePath))
+      Con::errorf("ShapeAsset::initializeAsset (%s) could not find %s!", getAssetName(), mConstructorFilePath);
    mDiffuseImposterPath = getOwned() ? expandAssetFilePath(mDiffuseImposterFileName) : mDiffuseImposterFileName;
    if (mDiffuseImposterPath == StringTable->EmptyString())
    {

BIN
Templates/BaseGame/game/data/Prototyping/shapes/Primitives/ConePrimitive.fbx


BIN
Templates/BaseGame/game/data/Prototyping/shapes/Primitives/CubePrimitive.fbx


BIN
Templates/BaseGame/game/data/Prototyping/shapes/Primitives/CylinderPrimitive.fbx


BIN
Templates/BaseGame/game/data/Prototyping/shapes/Primitives/SpherePrimitive.fbx


BIN
Templates/BaseGame/game/data/Prototyping/shapes/Primitives/TorusPrimitive.fbx


BIN
Templates/BaseGame/game/data/Prototyping/shapes/Primitives/TubePrimitive.fbx