Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-08-04 13:59:20 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-08-04 13:59:20 +0300
commitd6762bedee6fd12308e4cd6b46521caf1e2f6395 (patch)
tree86b6af1c23e97adc7d7527977d7133642b0d77be /source/blender/editors/space_image
parent778f0aca5263f9fd37ef1f7a1162af0328630cf8 (diff)
parentf921ae46658348121c3408b01171e0e21667438c (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r--source/blender/editors/space_image/image_edit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index cb0fdcf23ca..4eb4e6649d9 100644
--- 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);
}