svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / source / blender / editors / physics / particle_edit.c

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index b8cdc18e7393011f5b9222123b669338e66e115c..48963d9f5db35dccd4be1e1ecd37bb3af71ca129 100644 (file)
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -1058,7 +1058,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");
@@ -1069,7 +1069,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);
@@ -2594,7 +2594,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
        PTCacheEditPoint *newpoint, *new_points;
        POINT_P; KEY_K;
        HairKey *hkey;
-       int *mirrorfaces;
+       int *mirrorfaces = NULL;
        int rotation, totpart, newtotpart;
 
        if(psys->flag & PSYS_GLOBAL_HAIR)
@@ -2604,7 +2604,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);
@@ -2625,7 +2625,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
                        }
                }
 
-               if((point->flag & PEP_TAG) && mirrorfaces[pa->num*2] != -1)
+               if((point->flag & PEP_TAG) && mirrorfaces && mirrorfaces[pa->num*2] != -1)
                        newtotpart++;
        }
 
@@ -2662,7 +2662,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 
                        if(point->flag & PEP_HIDE)
                                continue;
-                       if(!(point->flag & PEP_TAG) || mirrorfaces[pa->num*2] == -1)
+                       if(!(point->flag & PEP_TAG) || (mirrorfaces && mirrorfaces[pa->num*2] == -1))
                                continue;
 
                        /* duplicate */
@@ -2672,7 +2672,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
                        if(point->keys) newpoint->keys= MEM_dupallocN(point->keys);
 
                        /* rotate weights according to vertex index rotation */
-                       rotation= mirrorfaces[pa->num*2+1];
+                       rotation= mirrorfaces ? mirrorfaces[pa->num*2+1] : 0;
                        newpa->fuv[0]= pa->fuv[2];
                        newpa->fuv[1]= pa->fuv[1];
                        newpa->fuv[2]= pa->fuv[0];
@@ -2684,7 +2684,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
                                        SHIFT3(float, newpa->fuv[0], newpa->fuv[1], newpa->fuv[2])
 
                        /* assign face inddex */
-                       newpa->num= mirrorfaces[pa->num*2];
+                                       newpa->num= mirrorfaces ? mirrorfaces[pa->num*2] : 0;
                        newpa->num_dmcache= psys_particle_dm_face_lookup(ob,psmd->dm,newpa->num,newpa->fuv, NULL);
 
                        /* update edit key pointers */
@@ -2706,7 +2706,8 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
                point->flag &= ~PEP_TAG;
        }
 
-       MEM_freeN(mirrorfaces);
+       if (mirrorfaces)
+               MEM_freeN(mirrorfaces);
 }
 
 static int mirror_exec(bContext *C, wmOperator *UNUSED(op))
@@ -3106,8 +3107,8 @@ static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm, floa
                VECCOPY(p_max,pa_minmax+3);
        }
 
-       totface=dm->getNumFaces(dm);
-       mface=dm->getFaceDataArray(dm,CD_MFACE);
+       totface=dm->getNumTessFaces(dm);
+       mface=dm->getTessFaceDataArray(dm,CD_MFACE);
        mvert=dm->getVertDataArray(dm,CD_MVERT);
        
        /* lets intersect the faces */