[Bf-blender-cvs] [88174bd22c8] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Sun Jan 28 05:18:16 CET 2018


Commit: 88174bd22c8798fa5038a3b8d5192e052bfe673e
Author: Campbell Barton
Date:   Sun Jan 28 15:18:33 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB88174bd22c8798fa5038a3b8d5192e052bfe673e

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/mesh/mesh_navmesh.c
index d7e59a05772,740d18951dc..bd2ad21d51c
--- a/source/blender/editors/mesh/mesh_navmesh.c
+++ b/source/blender/editors/mesh/mesh_navmesh.c
@@@ -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);



More information about the Bf-blender-cvs mailing list