Merge with hotfix

--HG--
branch : develop
This commit is contained in:
kaetemi 2014-12-04 13:21:40 +01:00
commit b762356a16

View file

@ -37,7 +37,6 @@ int EditPatchMod::DoAttach(INode *node, PatchMesh *attPatch, RPatchMesh *rattPat
nodes.DisposeTemporary(); nodes.DisposeTemporary();
return 0; return 0;
} }
patchData->BeginEdit(ip->GetTime());
// If the mesh isn't yet cached, this will cause it to get cached. // If the mesh isn't yet cached, this will cause it to get cached.
RPatchMesh *rpatch; RPatchMesh *rpatch;
@ -49,6 +48,7 @@ int EditPatchMod::DoAttach(INode *node, PatchMesh *attPatch, RPatchMesh *rattPat
} }
patchData->RecordTopologyTags(patch); patchData->RecordTopologyTags(patch);
RecordTopologyTags(); RecordTopologyTags();
patchData->BeginEdit(ip->GetTime());
// Transform the shape for attachment: // Transform the shape for attachment:
// If reorienting, just translate to align pivots // If reorienting, just translate to align pivots