|
@@ -333,8 +333,14 @@ Model3DData::~Model3DData()
|
|
|
{
|
|
{
|
|
|
clearModel();
|
|
clearModel();
|
|
|
polygons->release();
|
|
polygons->release();
|
|
|
- dxIndexBuffer->release();
|
|
|
|
|
- dxVertexBuffer->release();
|
|
|
|
|
|
|
+ if (dxIndexBuffer)
|
|
|
|
|
+ {
|
|
|
|
|
+ dxIndexBuffer->release();
|
|
|
|
|
+ }
|
|
|
|
|
+ if (dxVertexBuffer)
|
|
|
|
|
+ {
|
|
|
|
|
+ dxVertexBuffer->release();
|
|
|
|
|
+ }
|
|
|
delete[] indexBuffer;
|
|
delete[] indexBuffer;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -491,8 +497,8 @@ void Model3DData::copyModel2D(Model2DData* model, float z)
|
|
|
for (auto j : *i)
|
|
for (auto j : *i)
|
|
|
{
|
|
{
|
|
|
for (auto k = j->zListe()->begin();
|
|
for (auto k = j->zListe()->begin();
|
|
|
- k && k.hasNext() && k.next().hasNext();
|
|
|
|
|
- k++)
|
|
|
|
|
|
|
+ k && k.hasNext() && k.next().hasNext();
|
|
|
|
|
+ k++)
|
|
|
p->indexAnz += 3;
|
|
p->indexAnz += 3;
|
|
|
}
|
|
}
|
|
|
p->indexList = new int[p->indexAnz];
|
|
p->indexList = new int[p->indexAnz];
|