diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-14 04:09:33 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-14 04:09:33 +0300 |
| commit | db1099c0aeec3b793296808c77ea8eb9abad33f0 (patch) | |
| tree | 8cd7de7b7139269cdb411ea0ca32485a608b1ae2 /source/blender/blenkernel/intern/image.c | |
| parent | 879032d2ab95fb6124eb95b131a0bbc315a05dfe (diff) | |
| parent | ec324d87411b1e6ae9285eab2efcecb479d4dd46 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index f5b28355d85..56cdce05d57 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; |