diff options
| author | Julian Eisel <julian_eisel@web.de> | 2015-02-22 19:14:19 +0300 |
|---|---|---|
| committer | Julian Eisel <julian_eisel@web.de> | 2015-02-22 19:14:19 +0300 |
| commit | 0f1ffd4792acb0d93f12bad593ae8ee0054dcc5b (patch) | |
| tree | 67dd2c9a04617f531f76b063ba95adaa3a68afe8 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 63b0a7feb2897eaabf39422d8c08b35b19053327 (diff) | |
Fix T43768: Pointcache end frame ignores preview range
Fix for T43768
This way it works consistent with cloth, softbodys, etc.
Reviewers: lukastoenne
Differential Revision: https://developer.blender.org/D1134
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 04181606796..cacaea39877 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1191,7 +1191,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)); } /************************************************/ |