archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bug fix: particle point cache was reset on start frame if particles had grid distribution even if there were no changes.

Browse Source
This commit is contained in:
Janne Karhu
2011-01-07 11:38:28 +00:00
parent 29efbf8a04
commit 3c6077e8ec
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,6 +130,16 @@ int psys_get_current_display_percentage(ParticleSystem *psys)
return psys->part->disp; return psys->part->disp;
} }
static int tot_particles(ParticleSystem *psys, PTCacheID *pid)
{
if(pid && psys->pointcache->flag & PTCACHE_EXTERNAL)
return pid->cache->totpoint;
else if(psys->part->distr == PART_DISTR_GRID && psys->part->from != PART_FROM_VERT)
return psys->part->grid_res * psys->part->grid_res * psys->part->grid_res;
else
return psys->part->totpart;
}
void psys_reset(ParticleSystem *psys, int mode) void psys_reset(ParticleSystem *psys, int mode)
{ {
PARTICLE_P; PARTICLE_P;
@@ -137,7 +147,7 @@ void psys_reset(ParticleSystem *psys, int mode)
if(ELEM(mode, PSYS_RESET_ALL, PSYS_RESET_DEPSGRAPH)) { if(ELEM(mode, PSYS_RESET_ALL, PSYS_RESET_DEPSGRAPH)) {
if(mode == PSYS_RESET_ALL || !(psys->flag & PSYS_EDITED)) { if(mode == PSYS_RESET_ALL || !(psys->flag & PSYS_EDITED)) {
/* don't free if not absolutely necessary */ /* don't free if not absolutely necessary */
if(psys->totpart != psys->part->totpart) { if(psys->totpart != tot_particles(psys, NULL)) {
psys_free_particles(psys); psys_free_particles(psys);
psys->totpart= 0; psys->totpart= 0;
} }
@@ -3633,14 +3643,7 @@ static int emit_particles(ParticleSimulationData *sim, PTCacheID *pid, float UNU
ParticleSystem *psys = sim->psys; ParticleSystem *psys = sim->psys;
ParticleSettings *part = psys->part; ParticleSettings *part = psys->part;
int oldtotpart = psys->totpart; int oldtotpart = psys->totpart;
int totpart = oldtotpart; int totpart = tot_particles(psys, pid);
if(pid && psys->pointcache->flag & PTCACHE_EXTERNAL)
totpart = pid->cache->totpoint;
else if(part->distr == PART_DISTR_GRID && part->from != PART_FROM_VERT)
totpart = part->grid_res*part->grid_res*part->grid_res;
else
totpart = psys->part->totpart;
if(totpart != oldtotpart) if(totpart != oldtotpart)
realloc_particles(sim, totpart); realloc_particles(sim, totpart);