diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-01-19 19:32:29 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-19 19:32:29 +0300 |
commit | d450dbec9177f2e691fddbefdab20adda18c7ae3 (patch) | |
tree | ef57d87a2714354da103960926c004edc1874942 /source/blender/src/drawobject.c | |
parent | 7b6c88473c02d97485970390086395b515be653e (diff) |
add the option to add the parents time offset value.
Diffstat (limited to 'source/blender/src/drawobject.c')
-rw-r--r-- | source/blender/src/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 3e154298517..1d30815f29a 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -2857,7 +2857,7 @@ static void draw_particle_system(Base *base, PartEff *paf) mymultmatrix(mat); } - if(ob->ipoflag & OB_OFFS_PARTICLE) ptime= ob->sf; + if(ob->ipoflag & OB_OFFS_PARTICLE) ptime= give_timeoffset(ob); else ptime= 0.0; ctime= bsystem_time(ob, (float)(G.scene->r.cfra), ptime); @@ -5248,7 +5248,7 @@ void draw_object(Base *base, int flag) for (ct= targets.first; ct; ct= ct->next) { /* calculate target's matrix */ if (cti->get_target_matrix) - cti->get_target_matrix(curcon, cob, ct, bsystem_time(ob, (float)(G.scene->r.cfra), ob->sf)); + cti->get_target_matrix(curcon, cob, ct, bsystem_time(ob, (float)(G.scene->r.cfra), give_timeoffset(ob))); else Mat4One(ct->matrix); |