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/modifiers | |
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/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_build.c | 7 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 10c2f6019ed..10f5645ca3b 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -106,12 +106,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, faceMap = MEM_callocN(sizeof(*faceMap) * maxFaces, "build modifier faceMap"); for(i = 0; i < maxFaces; ++i) faceMap[i] = i; - if (ob) { - frac = bsystem_time(md->scene, ob, md->scene->r.cfra, - bmd->start - 1.0f) / bmd->length; - } else { - frac = BKE_curframe(md->scene) - bmd->start / bmd->length; - } + frac = BKE_curframe(md->scene) - bmd->start / bmd->length; CLAMP(frac, 0.0f, 1.0f); numFaces = dm->getNumFaces(dm) * frac; diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 8dcb6f4b4d9..9821c0b3836 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -804,10 +804,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd, /* timestep= psys_get_timestep(&sim); */ - //if(part->flag & PART_GLOB_TIME) - cfra= BKE_curframe(scene); - //else - // cfra=bsystem_time(scene, ob,(float)scene->r.cfra,0.0); + cfra= BKE_curframe(scene); /* hash table for vertice <-> particle relations */ vertpahash= BLI_edgehash_new(); |