Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 04:18:33 +0000 (15:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 04:18:33 +0000 (15:18 +1100)
1  2 
intern/cycles/blender/blender_mesh.cpp
source/blender/blenloader/intern/writefile.c
source/blender/editors/mesh/mesh_navmesh.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_wm_api.c

index d7e59a05772cf20f2be49ebd27557ce14fe9892a,740d18951dcb7cceb8497f7ba998404bf7be237c..bd2ad21d51ca24b24233039abfea3a7173e3323f
@@@ -74,8 -72,7 +74,8 @@@ static void createVertsTrisData(bContex
        LinkNode *oblink, *dmlink;
        DerivedMesh *dm;
        Scene *scene = CTX_data_scene(C);
 -      LinkNodePair dms_pair = {NULL,NULL};
 +      EvaluationContext eval_ctx;
-       LinkNode *dms = NULL;
++      LinkNodePair dms_pair = {NULL, NULL};
  
        int nverts, ntris, *tris;
        float *verts;
@@@ -88,9 -83,9 +88,9 @@@
        /* calculate number of verts and tris */
        for (oblink = obs; oblink; oblink = oblink->next) {
                ob = (Object *) oblink->link;
 -              dm = mesh_create_derived_no_virtual(scene, ob, NULL, CD_MASK_MESH);
 +              dm = mesh_create_derived_no_virtual(&eval_ctx, 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);