Skip to content

Commit d6c32f3

Browse files
committed
only dsq should call import sequence
1 parent 4f32fec commit d6c32f3

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

Engine/source/gui/editor/guiShapeEdPreview.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,14 @@ bool GuiShapeEdPreview::setObjectShapeAsset(const char* assetId)
476476
ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(id);
477477
StringTableEntry animPath = asset->getAnimationPath();
478478
AssetDatabase.releaseAsset(id);
479-
480479
Torque::Path dsqPath(animPath);
480+
String fileExt = String::ToLower(dsqPath.getExtension());
481+
482+
if (fileExt != String("dsq"))
483+
{
484+
return setObjectModel(animPath);
485+
}
486+
481487
Torque::Path shapePath;
482488
if (!findCompanionShape(dsqPath, shapePath))
483489
{

Engine/source/ts/tsShapeOldRead.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ bool TSShape::importSequences(Stream * s, const String& sequencePath)
435435
{
436436
// error -- don't support future version yet :>
437437
Con::errorf(ConsoleLogEntry::General,
438-
"Sequence import failed: attempt to load a version %i ddsq-animation, can currently only load version %i and before.",
438+
"Sequence import failed: attempt to load a version %i dsq-animation, can currently only load version %i and before.",
439439
smReadVersion, smVersion);
440440
return false;
441441
}

0 commit comments

Comments
 (0)