diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-02-18 03:21:19 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-02-18 03:21:19 +0300 |
| commit | fd155103a23d8648a64ad74c7c97fa373f441599 (patch) | |
| tree | 128bbfc3bc935775204ecdbdd167485b86aa7235 /source/blender/blenkernel/intern/particle.c | |
| parent | 6a9734821dd93a936e54fdc2bb75f376ddceecc6 (diff) | |
Particle fluid settings weren't copied when particle settings were copied.
* Also removed some unnecessary null checks.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index bbc597788fe..4609e64c271 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3571,9 +3571,10 @@ ParticleSettings *psys_copy_settings(ParticleSettings *part) int a; partn= copy_libblock(part); - if(partn->pd) partn->pd= MEM_dupallocN(part->pd); - if(partn->pd2) partn->pd2= MEM_dupallocN(part->pd2); - partn->effector_weights = MEM_dupallocN(part->effector_weights); + partn->pd= MEM_dupallocN(part->pd); + partn->pd2= MEM_dupallocN(part->pd2); + partn->effector_weights= MEM_dupallocN(part->effector_weights); + partn->fluid= MEM_dupallocN(part->fluid); partn->boids = boid_copy_settings(part->boids); |