diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:35:14 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:38:05 +0300 |
| commit | baca8611e5fe4b3dcd6f5065fb125bc0a9d65934 (patch) | |
| tree | bb1230387cd53b15f9621f10c4d0e5e2050b5580 /intern/cycles/blender/blender_particles.cpp | |
| parent | 31705201dddebf7e3be5c4533b89f380aad1ede1 (diff) | |
| parent | 2930d4fcea405985f2212c5f28c061af7c4849f8 (diff) | |
Merge branch 'master' into active-fcurve-keyframeactive-fcurve-keyframe
Diffstat (limited to 'intern/cycles/blender/blender_particles.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_particles.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index e5eab1ae62b..ee14217988b 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -53,7 +53,8 @@ bool BlenderSync::sync_dupli_particle(BL::Object &b_ob, ParticleSystem *psys; bool first_use = !particle_system_map.is_used(key); - bool need_update = particle_system_map.add_or_update(&psys, b_ob, b_instance.object(), key); + bool need_update = particle_system_map.add_or_update( + scene, &psys, b_ob, b_instance.object(), key); /* no update needed? */ if (!need_update && !object->geometry->need_update && !scene->object_manager->need_update) |