[Bf-blender-cvs] [0f1ffd4] master: Fix T43768: Pointcache end frame ignores preview range

Julian Eisel noreply at git.blender.org
Sun Feb 22 17:14:29 CET 2015


Commit: 0f1ffd4792acb0d93f12bad593ae8ee0054dcc5b
Author: Julian Eisel
Date:   Sun Feb 22 17:14:19 2015 +0100
Branches: master
https://developer.blender.org/rB0f1ffd4792acb0d93f12bad593ae8ee0054dcc5b

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

===================================================================

M	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 0418160..cacaea3 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));
 }
 
 /************************************************/




More information about the Bf-blender-cvs mailing list