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_explode.c | |
| parent | 735ab2b22d865570a4585e7088e66a45030ddf2d (diff) | |
| parent | b18e661ffcd39b97ac0c8295d778a1cb31339ed8 (diff) | |
svn merge ^/trunk/blender -r41503:41575
Diffstat (limited to 'source/blender/modifiers/intern/MOD_explode.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 70766b55a1e..e317c97c4d3 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -812,10 +812,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(); |