TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1690 from John3/fixDatablockPhysicsShape

Browse source 
fix create datablock for physicsshapes.
This commit is contained in:
Anis 2016-08-07 03:08:15 +02:00 committed by GitHub
parent 4c59f39c09 4936567c0d
commit 88ac03cce0
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Engine/source/T3D/physics/physicsShape.cpp
View file

@ -271,7 +271,7 @@ bool PhysicsShapeData::preload( bool server, String &errorBuffer )
{
if ( !Parent::preload( server, errorBuffer ) )
return false;
// If we don't have a physics plugin active then
// we have to fail completely.
if ( !PHYSICSMGR )
@ -280,19 +280,24 @@ bool PhysicsShapeData::preload( bool server, String &errorBuffer )
return false;
}
if ( !shapeName || !shapeName[0] )
if( shapeName && shapeName[0] != '\0' && !bool(shape) )
{
errorBuffer = "PhysicsShapeData::preload - No shape name defined.";
return false;
}
// Load the shape.
shape = ResourceManager::get().load(shapeName);
if( bool(shape) == false )
{
errorBuffer = String::ToString("PhysicsShapeData::load: Couldn't load shape \"%s\"", shapeName);
return false;
}
else
{
TSShapeInstance* pDummy = new TSShapeInstance(shape, !server);
delete pDummy;
}
// Load the shape.
shape = ResourceManager::get().load( shapeName );
if ( bool(shape) == false )
{
errorBuffer = String::ToString( "PhysicsShapeData::preload - Unable to load shape '%s'.", shapeName );
return false;
}
else
return false;
// Prepare the shared physics collision shape.
if ( !colShape )