svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / render / intern / source / strand.c
index 9f5c2c394728025cd6eb61c01b8016c2be6b840f..129abc918b3544020a07b6ad9e2f28f9717e033d 100644 (file)
@@ -980,7 +980,7 @@ StrandSurface *cache_strand_surface(Render *re, ObjectRen *obr, DerivedMesh *dm,
        int a, totvert, totface;
 
        totvert= dm->getNumVerts(dm);
-       totface= dm->getNumFaces(dm);
+       totface= dm->getNumTessFaces(dm);
 
        for(mesh=re->strandsurface.first; mesh; mesh=mesh->next)
                if(mesh->obr.ob == obr->ob && mesh->obr.par == obr->par
@@ -1014,7 +1014,7 @@ StrandSurface *cache_strand_surface(Render *re, ObjectRen *obr, DerivedMesh *dm,
                mul_m4_v3(mat, co[a]);
        }
 
-       mface= dm->getFaceArray(dm);
+       mface= dm->getTessFaceArray(dm);
        for(a=0; a<mesh->totface; a++, mface++) {
                mesh->face[a][0]= mface->v1;
                mesh->face[a][1]= mface->v2;