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

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source
This commit is contained in:
Jeff Hutchinson 2021-08-29 22:28:42 -04:00
commit 6e072dbf91
62 changed files with 388 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/console/consoleTypes.cpp
View file

@ -975,13 +975,16 @@ ConsoleSetType( TypePID )
else
{
Torque::UUID uuid;
if( !uuid.fromString( argv[ 0 ] ) )
{
if( !uuid.fromString( argv[ 0 ] ) )
{
Con::errorf( "Error parsing UUID in PID: '%s'", argv[ 0 ] );
*pid = NULL;
}
else
*pid = SimPersistID::findOrCreate( uuid );
}
else
{
*pid = SimPersistID::findOrCreate(uuid);
}
}
}
else