Cleanup
This commit is contained in:
parent
e90c325f1b
commit
c9437f9bd5
9 changed files with 17 additions and 20 deletions
|
@ -99,7 +99,7 @@ bool SLightBuild::canConvertFromMaxLight (INode *node, TimeValue tvTime)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if( deleteIt )
|
if( deleteIt )
|
||||||
maxLight->MaybeAutoDelete();
|
maxLight->DeleteThis();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -305,7 +305,7 @@ void SLightBuild::convertFromMaxLight (INode *node,TimeValue tvTime)
|
||||||
this->rSoftShadowConeLength = (float)atof(sTmp.c_str());
|
this->rSoftShadowConeLength = (float)atof(sTmp.c_str());
|
||||||
|
|
||||||
if( deleteIt )
|
if( deleteIt )
|
||||||
maxLight->MaybeAutoDelete();
|
maxLight->DeleteThis();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ***********************************************************************************************
|
// ***********************************************************************************************
|
||||||
|
|
|
@ -135,7 +135,7 @@ CCollisionMeshBuild* CExportNel::createCollisionMeshBuild(std::vector<INode *> &
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -238,7 +238,7 @@ void CExportNel::getLights (std::vector<CLight>& vectLight, TimeValue time, INod
|
||||||
|
|
||||||
// Delete the GenLight if we should...
|
// Delete the GenLight if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
maxLight->MaybeAutoDelete();
|
maxLight->DeleteThis();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -179,7 +179,7 @@ bool CExportNel::buildLodCharacter (NL3D::CLodCharacterShapeBuild& lodBuild, IN
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,7 +110,7 @@ CMesh::CMeshBuild* CExportNel::createMeshBuild(INode& node, TimeValue tvTime, CM
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -449,7 +449,7 @@ NL3D::IShape *CExportNel::buildShape (INode& node, TimeValue time, const TInodeP
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1406,7 +1406,7 @@ IMeshGeom *CExportNel::buildMeshGeom (INode& node, TimeValue time, const TInodeP
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2058,7 +2058,7 @@ NL3D::IShape *CExportNel::buildWaterShape(INode& node, TimeValue time)
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
nlinfo("WaterShape : build succesful");
|
nlinfo("WaterShape : build succesful");
|
||||||
return ws;
|
return ws;
|
||||||
|
@ -2100,11 +2100,8 @@ bool CExportNel::buildMeshAABBox(INode &node, NLMISC::CAABBox &dest, TimeValue t
|
||||||
dest.setMinMax(nelMin, nelMax);
|
dest.setMinMax(nelMin, nelMax);
|
||||||
//
|
//
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
{
|
tri->DeleteThis();
|
||||||
#ifdef NL_DONT_FIND_MAX_CRASH
|
|
||||||
tri->MaybeAutoDelete();
|
|
||||||
#endif // NL_DEBUG
|
|
||||||
}
|
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -180,7 +180,7 @@ bool CMeshInterface::buildFromMaxMesh(INode &node, TimeValue tvTime)
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -362,7 +362,7 @@ static void AddNodeToQuadGrid(const NLMISC::CAABBox &delimiter, TNodeFaceQG &des
|
||||||
nldebug("%d faces where added", numFaceAdded);
|
nldebug("%d faces where added", numFaceAdded);
|
||||||
//
|
//
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -495,7 +495,7 @@ static bool SelectVerticesInMeshFromInterfaces(const std::vector<CMeshInterface>
|
||||||
if (obj != tri)
|
if (obj != tri)
|
||||||
{
|
{
|
||||||
// not a mesh object, so do nothing
|
// not a mesh object, so do nothing
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1272,7 +1272,7 @@ void CExportNel::buildCamera(NL3D::CCameraInfo &cameraInfo, INode& node, TimeVal
|
||||||
cameraInfo.Fov = genCamera->GetFOV(time);
|
cameraInfo.Fov = genCamera->GetFOV(time);
|
||||||
|
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
genCamera->MaybeAutoDelete();
|
genCamera->DeleteThis();
|
||||||
genCamera = NULL;
|
genCamera = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1446,7 +1446,7 @@ bool CExportNel::mirrorPhysiqueSelection(INode &node, TimeValue tvTime, const st
|
||||||
|
|
||||||
// Delete the triObject if we should...
|
// Delete the triObject if we should...
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
tri = NULL;
|
tri = NULL;
|
||||||
|
|
||||||
// ok!
|
// ok!
|
||||||
|
|
|
@ -154,7 +154,7 @@ bool CExportNel::buildVegetableShape (NL3D::CVegetableShape& skeletonShape, INo
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deleteIt)
|
if (deleteIt)
|
||||||
tri->MaybeAutoDelete();
|
tri->DeleteThis();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue