From 88841559de55ee833b04ae2d1812e1be60edca86 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 14 May 2020 02:38:02 +0200 Subject: Fix T66005: crash deleting render slot while rendering to it --- source/blender/blenkernel/intern/image.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index ee1bd5afa61..906d76dfed8 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -5726,6 +5726,13 @@ RenderSlot *BKE_image_add_renderslot(Image *ima, const char *name) bool BKE_image_remove_renderslot(Image *ima, ImageUser *iuser, int index) { + if (index == ima->last_render_slot) { + /* Don't remove render slot while rendering to it. */ + if (G.is_rendering) { + return false; + } + } + int num_slots = BLI_listbase_count(&ima->renderslots); if (index >= num_slots || num_slots == 1) { return false; -- cgit v1.2.3