[Bf-blender-cvs] [88841559de5] blender-v2.83-release: Fix T66005: crash deleting render slot while rendering to it

[Brecht Van Lommel]

Commit: 88841559de55ee833b04ae2d1812e1be60edca86
Author: Brecht Van Lommel
Date:   Thu May 14 02:38:02 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB88841559de55ee833b04ae2d1812e1be60edca86

Fix T66005: crash deleting render slot while rendering to it

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

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;