From 408adfae8acdb1f3a0ccc65ce889d5d2237681e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Tue, 20 Jan 2015 16:38:03 +0100 Subject: Fix for BI rendering of hair spirals: Was not taking the extra points into account. --- source/blender/render/intern/source/convertblender.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source/blender/render') 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)) { -- cgit v1.2.3