mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-06-01 10:36:36 +00:00
only dsq should call import sequence
This commit is contained in:
parent
4f32fec320
commit
d6c32f3e35
2 changed files with 8 additions and 2 deletions
|
|
@ -476,8 +476,14 @@ bool GuiShapeEdPreview::setObjectShapeAsset(const char* assetId)
|
|||
ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(id);
|
||||
StringTableEntry animPath = asset->getAnimationPath();
|
||||
AssetDatabase.releaseAsset(id);
|
||||
|
||||
Torque::Path dsqPath(animPath);
|
||||
String fileExt = String::ToLower(dsqPath.getExtension());
|
||||
|
||||
if (fileExt != String("dsq"))
|
||||
{
|
||||
return setObjectModel(animPath);
|
||||
}
|
||||
|
||||
Torque::Path shapePath;
|
||||
if (!findCompanionShape(dsqPath, shapePath))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ bool TSShape::importSequences(Stream * s, const String& sequencePath)
|
|||
{
|
||||
// error -- don't support future version yet :>
|
||||
Con::errorf(ConsoleLogEntry::General,
|
||||
"Sequence import failed: attempt to load a version %i ddsq-animation, can currently only load version %i and before.",
|
||||
"Sequence import failed: attempt to load a version %i dsq-animation, can currently only load version %i and before.",
|
||||
smReadVersion, smVersion);
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue