diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 18:38:03 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 18:38:47 +0300 |
| commit | 408adfae8acdb1f3a0ccc65ce889d5d2237681e1 (patch) | |
| tree | f6da7c6d9ee3413ae6e7ba5f0adfa9aac64d6e7a /source/blender/render/intern/source/convertblender.c | |
| parent | 8604ec9053c14178a9c06feda1b9688741b124a0 (diff) | |
Fix for BI rendering of hair spirals: Was not taking the extra points
into account.
Diffstat (limited to 'source/blender/render/intern/source/convertblender.c')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 36103c84f50..1a8c4681862 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1344,11 +1344,13 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem if (re->r.scemode & R_VIEWPORT_PREVIEW) { /* preview render */ totchild = (int)((float)totchild * (float)part->disp / 100.0f); - step_nbr = part->draw_step; + step_nbr = 1 << part->draw_step; } else { - step_nbr = part->ren_step; + step_nbr = 1 << part->ren_step; } + if (ELEM(part->kink, PART_KINK_SPIRAL)) + step_nbr += part->kink_extra_steps; psys->flag |= PSYS_DRAWING; @@ -1432,7 +1434,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem /* 2.6 setup strand rendering */ if (part->ren_as == PART_DRAW_PATH && psys->pathcache) { - path_nbr=(int)pow(2.0, (double) step_nbr); + path_nbr = step_nbr; if (path_nbr) { if (!ELEM(ma->material_type, MA_TYPE_HALO, MA_TYPE_WIRE)) { |