[Bf-blender-cvs] [d1281bf9934] blender-v2.79a-release: Fix navmesh creation w/ multiple objects

[Campbell Barton]

Commit: d1281bf99343293d35de8baf4558561c4dacc743
Author: Campbell Barton
Date:   Fri Jan 26 13:10:02 2018 +1100
Branches: blender-v2.79a-release
https://developer.blender.org/rBd1281bf99343293d35de8baf4558561c4dacc743

Fix navmesh creation w/ multiple objects

D2976 by @dertom

===================================================================

M       source/blender/editors/mesh/mesh_navmesh.c

===================================================================

diff --git a/source/blender/editors/mesh/mesh_navmesh.c 
b/source/blender/editors/mesh/mesh_navmesh.c
index b95921964eb..740d18951dc 100644
--- a/source/blender/editors/mesh/mesh_navmesh.c
+++ b/source/blender/editors/mesh/mesh_navmesh.c
@@ -72,7 +72,7 @@ static void createVertsTrisData(bContext *C, LinkNode *obs,
        LinkNode *oblink, *dmlink;
        DerivedMesh *dm;
        Scene *scene = CTX_data_scene(C);
-       LinkNode *dms = NULL;
+       LinkNodePair dms_pair = {NULL,NULL};
 
        int nverts, ntris, *tris;
        float *verts;
@@ -85,7 +85,7 @@ static void createVertsTrisData(bContext *C, LinkNode *obs,
                ob = (Object *) oblink->link;
                dm = mesh_create_derived_no_virtual(scene, ob, NULL, 
CD_MASK_MESH);
                DM_ensure_tessface(dm);
-               BLI_linklist_prepend(&dms, dm);
+               BLI_linklist_append(&dms_pair, dm);
 
                nverts += dm->getNumVerts(dm);
                nfaces = dm->getNumTessFaces(dm);
@@ -101,6 +101,7 @@ static void createVertsTrisData(bContext *C, LinkNode *obs,
 
                *r_lay |= ob->lay;
        }
+       LinkNode *dms = dms_pair.list;
 
        /* create data */
        verts = MEM_mallocN(sizeof(float) * 3 * nverts, "createVertsTrisData 
verts");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs