diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-27 13:42:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-27 13:42:03 +0400 |
| commit | 75e570b2b71b6d655a71205345752993e1a1cc92 (patch) | |
| tree | 923f95b34586e9ff709ade309f9fd5060025c70b /source/blender/blenkernel/intern/particle_system.c | |
| parent | cfb435e8a52f41bc495c9aa65bae99aaddab1ad7 (diff) | |
| parent | 99075b35ed3e5f42f4e652f68b9a5612b54c4cde (diff) | |
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2f4c2806826..02e65f7044c 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3853,8 +3853,9 @@ static void update_children(ParticleSimulationData *sim) else if(sim->psys->part->childtype) { if(sim->psys->totchild != get_psys_tot_child(sim->scene, sim->psys)) distribute_particles(sim, PART_FROM_CHILD); - else - ; /* Children are up to date, nothing to do. */ + else { + /* Children are up to date, nothing to do. */ + } } else psys_free_children(sim->psys); |