From 0f1ffd4792acb0d93f12bad593ae8ee0054dcc5b Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sun, 22 Feb 2015 17:14:19 +0100 Subject: 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 --- source/blender/blenkernel/intern/particle_system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/particle_system.c') 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)); } /************************************************/ -- cgit v1.2.3