TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tsmesh: parentMesh and indicies to mParentMesh and mIndicies (usual deal, complaints about method vars or temp ones potentially conflicting with class vars)

Browse source
This commit is contained in:
Azaezel 2018-03-13 11:36:36 -05:00
parent 4a5c36352c
commit ef0a4bee08
8 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/ts/tsShapeEdit.cpp
View file

@ -756,13 +756,13 @@ void TSShape::removeMeshFromObject(S32 objIndex, S32 meshIndex)
if (meshes[k] == NULL)
continue;
if (meshes[k]->parentMesh == idxToRemove)
if (meshes[k]->mParentMesh == idxToRemove)
{
meshes[k]->parentMesh = -1;
meshes[k]->mParentMesh = -1;
}
else if (meshes[k]->parentMesh > idxToRemove)
else if (meshes[k]->mParentMesh > idxToRemove)
{
meshes[k]->parentMesh--;
meshes[k]->mParentMesh--;
}
}
@ -800,13 +800,13 @@ void TSShape::removeMeshFromObject(S32 objIndex, S32 meshIndex)
if (meshes[k] == NULL)
continue;
if (meshes[k]->parentMesh == idxToRemove)
if (meshes[k]->mParentMesh == idxToRemove)
{
meshes[k]->parentMesh = -1;
meshes[k]->mParentMesh = -1;
}
else if (meshes[k]->parentMesh > idxToRemove)
else if (meshes[k]->mParentMesh > idxToRemove)
{
meshes[k]->parentMesh--;
meshes[k]->mParentMesh--;
}
}
@ -937,7 +937,7 @@ TSMesh* TSShape::copyMesh( const TSMesh* srcMesh ) const
return mesh; // return an empty mesh
// Copy mesh elements
mesh->indices = srcMesh->indices;
mesh->mIndices = srcMesh->mIndices;
mesh->primitives = srcMesh->primitives;
mesh->numFrames = srcMesh->numFrames;
mesh->numMatFrames = srcMesh->numMatFrames;