diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-19 08:21:43 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-19 08:21:43 +0400 |
commit | 9da1a400fabccaa0dd3063eac39c181e1499bb4b (patch) | |
tree | 1ae3198948885bc63c733ca17ae9b48ba44d3f08 /source/blender/blenkernel/intern/effect.c | |
parent | 687c4b7ee35a6eeca75cbcc64c80436d89b6bedf (diff) |
svn merge ^/trunk/blender -c56907 -c56908
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index e2f04e68bf3..db1012456ef 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -619,7 +619,6 @@ int get_effector_data(EffectorCache *eff, EffectorData *efd, EffectedPoint *poin sim.scene= eff->scene; sim.ob= eff->ob; sim.psys= eff->psys; - sim.rng= NULL; /* TODO: time from actual previous calculated frame (step might not be 1) */ state.time = cfra - 1.0f; |