From 8ddf7556a512b2b2ce89b75c9660e01a7aba8675 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 9 Jul 2020 11:44:11 +0200 Subject: Fix T78718: Crash when deleting particle system modifier with the X Shortcut. Duplication and deletion code of modifiers was totally wrong for particle system, that special weird thing needs its own custom management. Note that for now I chose not to duplicate the particle settings ID when duplicating the modifier... --- source/blender/editors/include/ED_object.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 5ec4de5d597..d8f55a0f60a 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -362,9 +362,10 @@ struct ModifierData *ED_object_modifier_add(struct ReportList *reports, int type); bool ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, + struct Scene *scene, struct Object *ob, struct ModifierData *md); -void ED_object_modifier_clear(struct Main *bmain, struct Object *ob); +void ED_object_modifier_clear(struct Main *bmain, struct Scene *scene, struct Object *ob); bool ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md); @@ -392,6 +393,8 @@ bool ED_object_modifier_apply(struct Main *bmain, int mode, bool keep_modifier); int ED_object_modifier_copy(struct ReportList *reports, + struct Main *bmain, + struct Scene *scene, struct Object *ob, struct ModifierData *md); -- cgit v1.2.3