Merge branch 'GoaLitiuM-terrain_patch_collision_fix'
This commit is contained in:
@@ -110,6 +110,8 @@ void TerrainPatch::Init(Terrain* terrain, int16 x, int16 z)
|
||||
|
||||
TerrainPatch::~TerrainPatch()
|
||||
{
|
||||
if (HasCollision())
|
||||
DestroyCollision();
|
||||
#if TERRAIN_EDITING
|
||||
SAFE_DELETE(_dataHeightmap);
|
||||
for (int32 i = 0; i < TERRAIN_MAX_SPLATMAPS_COUNT; i++)
|
||||
@@ -117,12 +119,6 @@ TerrainPatch::~TerrainPatch()
|
||||
SAFE_DELETE(_dataSplatmap[i]);
|
||||
}
|
||||
#endif
|
||||
#if TERRAIN_USE_PHYSICS_DEBUG
|
||||
SAFE_DELETE_GPU_RESOURCE(_debugLines);
|
||||
#endif
|
||||
#if USE_EDITOR
|
||||
SAFE_DELETE_GPU_RESOURCE(_collisionTrianglesBuffer);
|
||||
#endif
|
||||
}
|
||||
|
||||
RawDataAsset* TerrainPatch::GetHeightfield() const
|
||||
|
||||
Reference in New Issue
Block a user