diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-11-06 10:08:18 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-11-06 10:08:18 +0400 |
| commit | 723484ec066d3e2d2b0943dc9dca156d63c07c39 (patch) | |
| tree | b7a6c13a32422df9acec10231a82a084c3d0c55a /source/blender/blenkernel/intern/anim.c | |
| parent | 440c1c2c1745b6d4acd13f405643100cb913fb3b (diff) | |
Removed old "bsystem_time()" function, which by now is just a
duplicate of BKE_curframe() which just takes two extra args.
For the few calls in the physics engine where CFRA+1 instead of CFRA
was being used, I've added a new BKE_nextframe() call, which will
calculate for CFRA+1 instead of CFRA in much the same way that
bsystem_time() would end up doing things (which means including
subframe steps).
Diffstat (limited to 'source/blender/blenkernel/intern/anim.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index f939c168f51..c1f294fb102 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1230,7 +1230,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p if(G.rendering == 0) no_draw_flag |= PARS_NO_DISP; - ctime = bsystem_time(scene, par, (float)scene->r.cfra, 0.0); + ctime = BKE_curframe(scene); /* NOTE: in old animsys, used parent object's timeoffset... */ totpart = psys->totpart; totchild = psys->totchild; |