diff options
author | Robert Guetzkow <rjg> | 2021-08-24 19:38:28 +0300 |
---|---|---|
committer | Robert Guetzkow <gitcommit@outlook.de> | 2021-08-24 19:41:22 +0300 |
commit | 38bdde852f1c38a2eaba2b8efc15b49f226baffd (patch) | |
tree | ea971797cd041a03a40eb39a8d0b1940fa13b5d5 /source/blender/blenkernel/BKE_particle.h | |
parent | 551521cfa48022d4cc32ea337ad3f9147a49e887 (diff) |
Fix T90715: Remove correct particle modifier through Python API
Before this patch attempting to remove a particle modifier programmatically
through Python would fail, because it deleted the modifier associated with
the currently active particle system instead of the one passed as an argument
to `bpy.types.ObjectModifiers.remove()`.
This fix adds an additional argument for the particle system to
`object_remove_particle_system`. This allows to specify which particle system
and its associated modifier shall be removed. In case of
`particle_system_remove_exec` it will remain the currently active particle
system, whereas `object_remove_particle_system` passes the particle system
of the modifier. Hence, the correct modifier will be removed.
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D12234
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index e5b547d2557..78a6e47ec48 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -368,7 +368,10 @@ struct ModifierData *object_copy_particle_system(struct Main *bmain, struct Scene *scene, struct Object *ob, const struct ParticleSystem *psys_orig); -void object_remove_particle_system(struct Main *bmain, struct Scene *scene, struct Object *ob); +void object_remove_particle_system(struct Main *bmain, + struct Scene *scene, + struct Object *ob, + struct ParticleSystem *psys); struct ParticleSettings *BKE_particlesettings_add(struct Main *bmain, const char *name); void psys_reset(struct ParticleSystem *psys, int mode); |