1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 9983e24f2c9..16900d6d894 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -161,6 +161,13 @@ int ED_object_modifier_remove(ReportList *reports, Scene *scene, Object *ob, Mod
 
         DAG_scene_sort(scene);
 	}
+	else if(md->type == eModifierType_Smoke) {
+		ModifierData *tmd = modifiers_findByType(ob, eModifierType_SmokeHR);
+		if(tmd) {
+			BLI_remlink(&ob->modifiers, tmd);
+			modifier_free(tmd);
+		}
+	}
 
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);