diff options
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 29849c69b6f..50b0fb1c9f5 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3967,16 +3967,18 @@ ModifierData *object_copy_particle_system(Main *bmain, return object_add_or_copy_particle_system(bmain, scene, ob, NULL, psys_orig); } -void object_remove_particle_system(Main *bmain, Scene *UNUSED(scene), Object *ob) +void object_remove_particle_system(Main *bmain, + Scene *UNUSED(scene), + Object *ob, + ParticleSystem *psys) { - ParticleSystem *psys = psys_get_current(ob); - ParticleSystemModifierData *psmd; - ModifierData *md; - - if (!psys) { + if (!ob || !psys) { return; } + ParticleSystemModifierData *psmd; + ModifierData *md; + /* Clear particle system in fluid modifier. */ if ((md = BKE_modifiers_findby_type(ob, eModifierType_Fluid))) { FluidModifierData *fmd = (FluidModifierData *)md; |