diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-08-05 13:21:29 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-08-05 13:21:29 +0400 |
commit | c4114780d43f2cc973eaad193c61127e9ee54b28 (patch) | |
tree | dbc551eee68dde0e0104deef4d028979dc1efca6 /source/blender/render | |
parent | 7dfbe481e26f1b067315ee067f772a9195faf7f2 (diff) |
Little code cleanup.
bsystem_time was being called with an extra variable, which was useless. Most of the places that called it, were passing NULL for that variable anyway.
I've also cleaned up that function a bit, but the underlying problems with that part of the code still exist (EVIL GLOBALS that are exported for frame_to_float), for mblur and fields rendering features. That remains for another time.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 5c57fc3d743..f57fa74f618 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1116,7 +1116,7 @@ static void render_particle_system(Render *re, Object *ob, Object *par, PartEff if(ob->ipoflag & OB_OFFS_PARTICLE) ptime= ob->sf; else ptime= 0.0; - ctime= bsystem_time(ob, 0, (float)re->scene->r.cfra, ptime); + ctime= bsystem_time(ob, (float)re->scene->r.cfra, ptime); seed= ma->seed1; for(a=0; a<paf->totpart; a++, pa+=paf->totkey, seed++) { @@ -1353,7 +1353,7 @@ static void render_static_particle_system(Render *re, Object *ob, PartEff *paf) if(ob->ipoflag & OB_OFFS_PARTICLE) ptime= ob->sf; else ptime= 0.0; - ctime= bsystem_time(ob, 0, (float)re->scene->r.cfra, ptime); + ctime= bsystem_time(ob, (float)re->scene->r.cfra, ptime); seed= ma->seed1; for(a=0; a<paf->totpart; a++, pa+=paf->totkey) { |