[Bf-blender-cvs] [6cbbe04ced3] blender-v2.83-release: Fix crash switching render slots when there is only one slot

Campbell Barton noreply at git.blender.org
Wed Aug 12 09:44:11 CEST 2020


Commit: 6cbbe04ced33344aceeec362f53c17b417a75543
Author: Campbell Barton
Date:   Tue Aug 4 19:55:54 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB6cbbe04ced33344aceeec362f53c17b417a75543

Fix crash switching render slots when there is only one slot

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

M	source/blender/editors/space_image/image_edit.c

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

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 7f911113b7c..6a37c094dac 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -397,7 +397,10 @@ bool ED_image_slot_cycle(struct Image *image, int direction)
     }
   }
 
-  if (i == num_slots) {
+  if (num_slots == 1) {
+    image->render_slot = 0;
+  }
+  else if (i == num_slots) {
     image->render_slot = ((cur == 1) ? 0 : 1);
   }



More information about the Bf-blender-cvs mailing list