1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 6d5d23c4d47..354d796f2e0 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -194,6 +194,15 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
 		}
 	}
 
+	// Make sure we don't have any bases which might reference freed objects.
+	FOREACH_SCENE_COLLECTION(freestyle_scene, sc)
+	{
+		BLI_freelistN(&sc->objects);
+	}
+	FOREACH_SCENE_COLLECTION_END
+	BLI_freelistN(&scene_layer->object_bases);
+	BLI_freelistN(&freestyle_scene->base);
+
 	// release materials
 	Link *lnk = (Link *)freestyle_bmain->mat.first;