diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
| commit | 5ef9039b7e2ea16bd4b651aab21d5aa690485569 (patch) | |
| tree | e67247fa43d89748900b697eb9bdf0341fe53afc /source/blender/modifiers/intern/MOD_explode.c | |
| parent | fb56dbc2afc7c8b6ffc24406ed82cbcbff090da3 (diff) | |
| parent | 5ebee683bd736ef80df939552bbe0d8e104b56df (diff) | |
Cycles: svn merge -r41531:41613 ^/trunk/blender
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 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(); |