blender
/
blender
130
398
Fork 575
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

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
This commit is contained in:
Julian Eisel 2015-02-22 17:14:19 +01:00
parent 63b0a7feb2
commit 0f1ffd4792
Notes: blender-bot 2023-02-14 09:27:21 +01:00 
Referenced by issue #43768, System particles end at the wrong frame when using alternative start/end frames
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/particle_system.c
View File

@ -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));
}
/************************************************/