diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-30 10:12:47 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-30 10:12:47 +0400 |
commit | 8c4744c4d6e1294df19fca638ad09cd55df0ceb0 (patch) | |
tree | 0137356e228d135803a9cfd886fcd928fbe30a12 /source/blender/render | |
parent | 13c8e189f61dbb342039d3811d3e80879c99f62c (diff) |
Fix for bug #17302: subsurf + particle size vertex groups did not
work correct, also refactored some code here to make it more clear.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 96909ec1041..05e2d0a521a 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1703,10 +1703,10 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem /* get orco */ if(tpsys && (part->from==PART_FROM_PARTICLE || part->phystype==PART_PHYS_NO)){ tpa=tpsys->particles+pa->num; - psys_particle_on_emitter(ob, psmd,tpart->from,tpa->num,pa->num_dmcache,tpa->fuv,tpa->foffset,co,nor,0,0,orco,0); + psys_particle_on_emitter(psmd,tpart->from,tpa->num,pa->num_dmcache,tpa->fuv,tpa->foffset,co,nor,0,0,orco,0); } else - psys_particle_on_emitter(ob, psmd,part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,nor,0,0,orco,0); + psys_particle_on_emitter(psmd,part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,nor,0,0,orco,0); num= pa->num_dmcache; @@ -1780,13 +1780,13 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem /* get orco */ if(part->childtype == PART_CHILD_FACES) { - psys_particle_on_emitter(ob, psmd, + psys_particle_on_emitter(psmd, PART_FROM_FACE, cpa->num,DMCACHE_ISCHILD, cpa->fuv,cpa->foffset,co,nor,0,0,orco,0); } else { ParticleData *par = psys->particles + cpa->parent; - psys_particle_on_emitter(ob, psmd, part->from, + psys_particle_on_emitter(psmd, part->from, par->num,DMCACHE_ISCHILD,par->fuv, par->foffset,co,nor,0,0,orco,0); } |