diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
| commit | f07df7287e60ede904993572fe9bfef2c3a324af (patch) | |
| tree | 205c89f1890164ad384dcd3e5d09547d44287ee3 /source/blender/editors/physics/particle_edit.c | |
| parent | 3267a619f1e1a5b5508e38cbc665da79f450b2e3 (diff) | |
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
Diffstat (limited to 'source/blender/editors/physics/particle_edit.c')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index b9e9005dd25..3993707dbb9 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -2623,7 +2623,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged) } } - if((point->flag & PEP_TAG) && mirrorfaces && mirrorfaces[pa->num*2] != -1) + if((point->flag & PEP_TAG) && mirrorfaces[pa->num*2] != -1) newtotpart++; } @@ -2660,7 +2660,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged) if(point->flag & PEP_HIDE) continue; - if(!(point->flag & PEP_TAG) || (mirrorfaces && mirrorfaces[pa->num*2] == -1)) + if(!(point->flag & PEP_TAG) || mirrorfaces[pa->num*2] == -1) continue; /* duplicate */ @@ -2670,7 +2670,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 ? mirrorfaces[pa->num*2+1] : 0; + rotation= mirrorfaces[pa->num*2+1]; newpa->fuv[0]= pa->fuv[2]; newpa->fuv[1]= pa->fuv[1]; newpa->fuv[2]= pa->fuv[0]; @@ -2682,7 +2682,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 ? mirrorfaces[pa->num*2] : 0; + newpa->num= mirrorfaces[pa->num*2]; newpa->num_dmcache= psys_particle_dm_face_lookup(ob,psmd->dm,newpa->num,newpa->fuv, NULL); /* update edit key pointers */ @@ -2704,8 +2704,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged) point->flag &= ~PEP_TAG; } - if (mirrorfaces) - MEM_freeN(mirrorfaces); + MEM_freeN(mirrorfaces); } static int mirror_exec(bContext *C, wmOperator *UNUSED(op)) |