TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

only dsq should call import sequence

Browse source
This commit is contained in:
marauder2k7 2026-05-26 11:33:06 +01:00
parent 4f32fec320
commit d6c32f3e35
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/gui/editor/guiShapeEdPreview.cpp
View file

@ -476,8 +476,14 @@ bool GuiShapeEdPreview::setObjectShapeAsset(const char* assetId)
ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(id); ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(id);
StringTableEntry animPath = asset->getAnimationPath(); StringTableEntry animPath = asset->getAnimationPath();
AssetDatabase.releaseAsset(id); AssetDatabase.releaseAsset(id);
Torque::Path dsqPath(animPath); Torque::Path dsqPath(animPath);
String fileExt = String::ToLower(dsqPath.getExtension());
if (fileExt != String("dsq"))
{
return setObjectModel(animPath);
}
Torque::Path shapePath; Torque::Path shapePath;
if (!findCompanionShape(dsqPath, shapePath)) if (!findCompanionShape(dsqPath, shapePath))
{ {

2
Engine/source/ts/tsShapeOldRead.cpp
View file

@ -435,7 +435,7 @@ bool TSShape::importSequences(Stream * s, const String& sequencePath)
{ {
// error -- don't support future version yet :> // error -- don't support future version yet :>
Con::errorf(ConsoleLogEntry::General, 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); smReadVersion, smVersion);
return false; return false;
} }