TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/DamageModel

Browse source 
# Conflicts:
#	Engine/source/T3D/vehicles/vehicle.cpp
This commit is contained in:
AzaezelX 2025-04-28 10:53:53 -05:00
commit be35c27411
64 changed files with 619 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/T3D/shapeBase.cpp
View file

@ -349,7 +349,7 @@ bool ShapeBaseData::preload(bool server, String &errorStr)
S32 i;
U32 assetStatus = ShapeAsset::getAssetErrCode(mShapeAsset);
if (assetStatus == AssetBase::Ok|| assetStatus == AssetBase::UsingFallback)
if (assetStatus == AssetBase::Ok || assetStatus == AssetBase::UsingFallback)
{
if (!server && !mShape->preloadMaterialList(mShape.getPath()) && NetConnection::filesWereDownloaded())
shapeError = true;
@ -912,7 +912,17 @@ void ShapeBaseData::unpackData(BitStream* stream)
silent_bbox_check = stream->readFlag();
}
//
//
void ShapeBaseData::onShapeChanged()
{
reloadOnLocalClient();
}
void ShapeBaseData::onDebrisChanged()
{
reloadOnLocalClient();
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------