Skip to content

Commit ed3592c

Browse files
committed
[GEN][ZH] Remove extra mesh unregister operation during object destruction, match Gen to ZH (#623)
1 parent 61ef23a commit ed3592c

File tree

2 files changed

+5
-7
lines changed
  • Generals/Code/Libraries/Source/WWVegas/WW3D2
  • GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2

2 files changed

+5
-7
lines changed

Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ MeshModelClass::MeshModelClass(const MeshModelClass & that) :
102102

103103
MeshModelClass::~MeshModelClass(void)
104104
{
105-
// WWDEBUG_SAY(("Note: Mesh %s was never used\n",Get_Name()));
106-
TheDX8MeshRenderer.Unregister_Mesh_Type(this);
107105

108106
Reset(0,0,0);
109107
REF_PTR_RELEASE(MatInfo);
@@ -151,6 +149,11 @@ MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
151149

152150
void MeshModelClass::Reset(int polycount,int vertcount,int passcount)
153151
{
152+
//DMS - We must delete the gapfiller object BEFORE the geometry is reset. Otherwise,
153+
// the number of stages and passes gets reset and the gapfiller cannot deallocate properly.
154+
delete GapFiller;
155+
GapFiller=NULL;
156+
154157
Reset_Geometry(polycount,vertcount);
155158

156159
// Release everything we have and reset to initial state
@@ -165,9 +168,6 @@ void MeshModelClass::Reset(int polycount,int vertcount,int passcount)
165168
}
166169
CurMatDesc = DefMatDesc;
167170

168-
delete GapFiller;
169-
GapFiller=NULL;
170-
171171
return ;
172172
}
173173

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ MeshModelClass::MeshModelClass(const MeshModelClass & that) :
106106

107107
MeshModelClass::~MeshModelClass(void)
108108
{
109-
// WWDEBUG_SAY(("Note: Mesh %s was never used\n",Get_Name()));
110-
TheDX8MeshRenderer.Unregister_Mesh_Type(this);
111109

112110
Reset(0,0,0);
113111
REF_PTR_RELEASE(MatInfo);

0 commit comments

Comments
 (0)