diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-11-08 04:20:50 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-11-08 04:20:50 +0400 |
| commit | aea95c78606a99b0fa9c4c29c9e922e4a03f2a69 (patch) | |
| tree | 96d3fcf8db47b09b5e8202e403b6b07ae85c7eb3 /source/blender/blenkernel | |
| parent | d424e1454bbf57b1e4d7d3de7c014f455d7f8890 (diff) | |
bmesh: fixed merge issues with navmesh (though I've not tested if it works yet).
also fixed a small crasher in bridge.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/navmesh_conversion.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 389b9755714..a6d91271218 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2400,7 +2400,7 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm) int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL; int res; - result = CDDM_copy(dm); + result = CDDM_copy(dm, 0); if (!CustomData_has_layer(&result->faceData, CD_RECAST)) { int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST); if (sourceRecastData) { diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c index e3b5b83964e..53eee35de3a 100644 --- a/source/blender/blenkernel/intern/navmesh_conversion.c +++ b/source/blender/blenkernel/intern/navmesh_conversion.c @@ -135,7 +135,7 @@ int buildRawVertIndicesData(DerivedMesh* dm, int *nverts_r, float **verts_r, //calculate number of tris nfaces = dm->getNumFaces(dm); - faces = dm->getFaceArray(dm); + faces = dm->getTessFaceArray(dm); ntris = nfaces; for (fi=0; fi<nfaces; fi++) { |