diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
| commit | eed13b43b19c619ccdcda67b17c0da65ad44879c (patch) | |
| tree | aa759322ad2b18becaf237671dd71ffbda9c2076 /source/blender/render | |
| parent | e10e1ac04e63ed04a5712e515ed28eb92a78fd62 (diff) | |
| parent | 2f1e118c30946bd3117c59cd45f13d79e4b612ec (diff) | |
merged from trunk 20741:20848
* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 199ff5dbb43..98e5819c0d3 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1857,8 +1857,6 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem strand->totvert++; } else{ - sd.first = 0; - sd.time = time; sd.size = hasize; if(k==1){ @@ -1866,8 +1864,13 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem sd.time = 0.0f; VECSUB(loc0,loc1,loc); VECADD(loc0,loc1,loc0); + + render_new_particle(re, obr, psmd->dm, ma, &sd, loc1, loc0, seed); } + sd.first = 0; + sd.time = time; + if(k) render_new_particle(re, obr, psmd->dm, ma, &sd, loc, loc1, seed); @@ -2558,7 +2561,7 @@ static void init_render_surf(Render *re, ObjectRen *obr) if(need_orco) orcobase= orco= get_object_orco(re, ob); displist.first= displist.last= 0; - makeDispListSurf(re->scene, ob, &displist, 1); + makeDispListSurf(re->scene, ob, &displist, 1, 0); dl= displist.first; /* walk along displaylist and create rendervertices/-faces */ |