diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 14:38:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 14:38:44 +0400 |
| commit | e936c78251de5bafa99439803ab4fd2caa4df3b2 (patch) | |
| tree | 51ccdc2efbab74903cb7b428619726832c3b1ab4 /source/blender/modifiers/intern/MOD_build.c | |
| parent | 735ab2b22d865570a4585e7088e66a45030ddf2d (diff) | |
| parent | b18e661ffcd39b97ac0c8295d778a1cb31339ed8 (diff) | |
svn merge ^/trunk/blender -r41503:41575
Diffstat (limited to 'source/blender/modifiers/intern/MOD_build.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_build.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 87989b541f5..ed28dda8076 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -115,12 +115,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; |