[Bf-blender-cvs] [408adfa] master: Fix for BI rendering of hair spirals: Was not taking the extra points into account.
Lukas Tönne
noreply at git.blender.org
Tue Jan 20 16:39:43 CET 2015
Commit: 408adfae8acdb1f3a0ccc65ce889d5d2237681e1
Author: Lukas Tönne
Date: Tue Jan 20 16:38:03 2015 +0100
Branches: master
https://developer.blender.org/rB408adfae8acdb1f3a0ccc65ce889d5d2237681e1
Fix for BI rendering of hair spirals: Was not taking the extra points
into account.
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 36103c8..1a8c468 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)) {
More information about the Bf-blender-cvs
mailing list