Merge branch 'blender-v2.90-release'

2020-08-04 12:59:20 +02:00
parent 778f0aca52 f921ae4665
commit d6762bedee
2 changed files with 12 additions and 3 deletions
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -400,7 +400,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);
  }