Revision: 58888
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58888
Author: campbellbarton
Date: 2013-08-04 03:02:35 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
avoid freeing NULL pointer for navmesh BuildVertIndArrays and dont truncate
memset arg.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
Modified: trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2013-08-04
03:00:04 UTC (rev 58887)
+++ trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2013-08-04
03:02:35 UTC (rev 58888)
@@ -120,14 +120,14 @@
int nAllVerts = 0;
float *allVerts = NULL;
buildNavMeshDataByDerivedMesh(dm, &vertsPerPoly, &nAllVerts,
&allVerts, &ndtris, &dtris,
- &npolys, &dmeshes, &polys, &dtrisToPolysMap,
&dtrisToTrisMap, &trisToFacesMap);
+ &npolys, &dmeshes, &polys,
&dtrisToPolysMap, &dtrisToTrisMap, &trisToFacesMap);
- MEM_freeN(dtrisToPolysMap);
- MEM_freeN(dtrisToTrisMap);
- MEM_freeN(trisToFacesMap);
+ MEM_SAFE_FREE(dtrisToPolysMap);
+ MEM_SAFE_FREE(dtrisToTrisMap);
+ MEM_SAFE_FREE(trisToFacesMap);
unsigned short *verticesMap = new unsigned short[nAllVerts];
- memset(verticesMap, 0xffff, sizeof(unsigned short)*nAllVerts);
+ memset(verticesMap, 0xff, sizeof(*verticesMap) * nAllVerts);
int curIdx = 0;
//vertices - mesh verts
//iterate over all polys and create map for their vertices
first...
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
