diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-23 20:50:10 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-23 20:50:10 +0300 |
| commit | 5de381ce5bc27d7b4a0b4569a7523291c8b5b53f (patch) | |
| tree | 7271046eece4a18dc00de797912c851ec1e65337 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 4887d4c52a974e26eeca838bf3ba4ea72e67febb (diff) | |
| parent | 2081fd1d7de40f7b3e1a529f5b450ed508fe9257 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 91057e4dcd5..5536507c849 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1192,7 +1192,7 @@ void psys_get_pointcache_start_end(Scene *scene, ParticleSystem *psys, int *sfra ParticleSettings *part = psys->part; *sfra = MAX2(1, (int)part->sta); - *efra = MIN2((int)(part->end + part->lifetime + 1.0f), scene->r.efra); + *efra = MIN2((int)(part->end + part->lifetime + 1.0f), MAX2(scene->r.pefra, scene->r.efra)); } /************************************************/ |