merge with/from trunk at r35190
[blender.git] / source / blender / editors / physics / particle_edit.c
index 9ea8dde058f351ee9dc7a44fd99ab206b7a26990..b5d07025ca5e377bc443313a536042ad2e8fa16f 100644 (file)
@@ -1051,7 +1051,7 @@ static void recalc_emitter_field(Object *ob, ParticleSystem *psys)
 
        BLI_kdtree_free(edit->emitter_field);
 
-       totface=dm->getNumFaces(dm);
+       totface=dm->getNumTessFaces(dm);
        /*totvert=dm->getNumVerts(dm);*/ /*UNSUED*/
 
        edit->emitter_cosnos=MEM_callocN(totface*6*sizeof(float),"emitter cosnos");
@@ -1062,7 +1062,7 @@ static void recalc_emitter_field(Object *ob, ParticleSystem *psys)
        nor=vec+3;
 
        for(i=0; i<totface; i++, vec+=6, nor+=6) {
-               MFace *mface=dm->getFaceData(dm,i,CD_MFACE);
+               MFace *mface=dm->getTessFaceData(dm,i,CD_MFACE);
                MVert *mvert;
 
                mvert=dm->getVertData(dm,mface->v1,CD_MVERT);
@@ -2676,7 +2676,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
        if(!psmd->dm)
                return;
 
-       mirrorfaces= mesh_get_x_mirror_faces(ob, NULL);
+       //BMESH_TODO mirrorfaces= mesh_get_x_mirror_faces(ob, NULL);
 
        if(!edit->mirror_cache)
                PE_update_mirror_cache(ob, psys);