From 92c519ff176a3c1563aa149e7c1c4ff87042f315 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Jun 2018 14:49:26 +0200 Subject: [PATCH] Blender Version Bump Without this, render slots aren't added. --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_280.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 0dddb8e7b0b..def7dfd753b 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -28,7 +28,7 @@ * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 280 -#define BLENDER_SUBVERSION 18 +#define BLENDER_SUBVERSION 19 /* Several breakages with 280, e.g. collections vs layers */ #define BLENDER_MINVERSION 280 #define BLENDER_MINSUBVERSION 0 diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 0324161f6e1..74ff53a45d9 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1588,6 +1588,9 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + } + + if (!MAIN_VERSION_ATLEAST(bmain, 280, 19)) { if (!DNA_struct_elem_find(fd->filesdna, "Image", "ListBase", "renderslot")) { for (Image *ima = bmain->image.first; ima; ima = ima->id.next) { if (ima->type == IMA_TYPE_R_RESULT) {