TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 05:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #256 from Bloodknight/UbuntuGCC9-fixes

Browse source 
Fix GCC9 complaints
This commit is contained in:
Brian Roberts 2020-07-22 13:29:28 -05:00 • committed by GitHub
commit 75c2ac26a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/assets/TerrainAsset.cpp
View file

@ -370,7 +370,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
if (!success)
{
Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset", fileName);
return false;
return nullptr;
}
ModuleDefinition* targetModuleDef = AssetImporter::getModuleFromPath(fileName);
@ -378,7 +378,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
if (!targetModuleDef)
{
Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset, unable to find a valid Module for the filePath", fileName);
return false;
return nullptr;
}
success = AssetDatabase.addDeclaredAsset(targetModuleDef, tamlPath.c_str());
@ -386,7 +386,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
if (!success)
{
Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset, unable to find a register asset with path", tamlPath.c_str());
return false;
return nullptr;
}
String assetId = targetModuleDef->getModuleId();

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

@ -354,7 +354,7 @@ bool AssetImportObject::_setFilePath(void* obj, const char* index, const char* d
void AssetImportObject::setFilePath(StringTableEntry pFilePath)
{
filePathString = pFilePath;
filePath = pFilePath;
filePath = Torque::Path(pFilePath);
}
ConsoleDocClass(AssetImporter,
@ -2041,7 +2041,7 @@ void AssetImporter::importAssets(AssetImportObject* assetItem)
if (isMethod(processCommand.c_str()))
{
ConsoleValueRef importReturnVal = Con::executef(this, processCommand.c_str(), childItem);
assetPath = importReturnVal.getStringValue();
assetPath = Torque::Path(importReturnVal.getStringValue());
}
}