TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mesh load issue & merge issue

Browse source
This commit is contained in:
James Urquhart 2016-08-21 02:15:26 +01:00
parent 41dfb64210
commit e7db0d7956
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -916,7 +916,10 @@ TSMesh* TSShape::copyMesh( const TSMesh* srcMesh ) const
}
bool TSShape::addMesh(TSMesh* mesh, const String& meshName)
{
{
// Ensure mesh is in editable state
mesh->makeEditable();
// Determine the object name and detail size from the mesh name
S32 detailSize = 999;
String objName(String::GetTrailingNumber(meshName, detailSize));