TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #233 from chaigler/terr_zoning_crash_fix

Browse source 
Fix for crash in _onZoningChanged methods when called by hidden objects.
This commit is contained in:
Brian Roberts 2020-07-02 15:03:49 -05:00 • committed by GitHub
commit 9239101303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/forest/forest.cpp
View file

@ -260,7 +260,9 @@ void Forest::setTransform( const MatrixF &mat )
void Forest::_onZoningChanged( SceneZoneSpaceManager *zoneManager ) void Forest::_onZoningChanged( SceneZoneSpaceManager *zoneManager )
{ {
if ( mData == NULL || zoneManager != getSceneManager()->getZoneManager() ) const SceneManager* sm = getSceneManager();
if (mData == NULL || (sm != NULL && sm->getZoneManager() != NULL && zoneManager != sm->getZoneManager()))
return; return;
mZoningDirty = true; mZoningDirty = true;

4
Engine/source/terrain/terrData.cpp
View file

@ -461,7 +461,9 @@ void TerrainBlock::_updateBounds()
void TerrainBlock::_onZoningChanged( SceneZoneSpaceManager *zoneManager ) void TerrainBlock::_onZoningChanged( SceneZoneSpaceManager *zoneManager )
{ {
if ( mCell == NULL || zoneManager != getSceneManager()->getZoneManager() ) const SceneManager* sm = getSceneManager();
if (mCell == NULL || (sm != NULL && sm->getZoneManager() != NULL && zoneManager != sm->getZoneManager()))
return; return;
mZoningDirty = true; mZoningDirty = true;