TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 21:05:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
This commit is contained in:
Jeff Hutchinson 2021-05-06 21:08:53 -04:00
commit 69d7a2f4a1
12 changed files with 90 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/assets/assetImporter.cpp
View file

@ -599,7 +599,13 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
assetImportObj->registerObject();
//sanitize
assetName.replace(" ", "_");
assetName.replace(' ', '_');
assetName.replace('~', '_');
assetName.replace('`', '_');
assetName.replace('-', '_');
assetName.replace('*', '_');
assetName.replace('-', '_');
assetName.replace('+', '_');
assetImportObj->assetType = assetType;
assetImportObj->filePath = filePath;