Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2010-09-01 13:47:19 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-09-01 13:47:19 +0400
commite50bdef6833f36d4671ec946500d360b34ea95d1 (patch)
tree2b5d670b1e801d0c74848e8b5679a32bab9161cd /source
parente5b9ad3817a348cd8e34e073dd0f0497f8d58b1d (diff)
Fix for [#23596] Particle Harmonics cache problem
* Non-dynamic particles weren't reset properly because they don't use pointcache
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index cfbab609f37..6eb86a7be87 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4035,6 +4035,10 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
{
PARTICLE_P;
+ /* Particles without dynamics haven't been reset yet because they don't use pointcache */
+ if(psys->recalc & PSYS_RECALC_RESET)
+ psys_reset(psys, PSYS_RESET_ALL);
+
if(emit_particles(&sim, NULL, cfra)) {
free_keyed_keys(psys);
distribute_particles(&sim, part->from);