merge with/from trunk at r35190
[blender.git] / source / blender / render / intern / source / strand.c
index 847db912025aa062eccd79bb27b65f4eba30aa97..67da11f49886cf8bf9b16447af60bcda3f118386 100644 (file)
@@ -970,7 +970,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
@@ -1004,7 +1004,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;