[Bf-blender-cvs] [1f71fb70575] userpref_redesign: Bump subversion for adding navigation region correctly on file load
Julian Eisel
noreply at git.blender.org
Sun Nov 25 15:35:18 CET 2018
Commit: 1f71fb705757789a1f9bb31f75c45da086b80453
Author: Julian Eisel
Date: Sun Nov 25 14:59:18 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB1f71fb705757789a1f9bb31f75c45da086b80453
Bump subversion for adding navigation region correctly on file load
===================================================================
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 32b9508a679..b34dc55ba44 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 33
+#define BLENDER_SUBVERSION 34
/* 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 880d748e63e..a844a2dc91b 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2428,7 +2428,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- {
+ if (!MAIN_VERSION_ATLEAST(bmain, 280, 34)) {
for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
for (SpaceLink *slink = area->spacedata.first; slink; slink = slink->next) {
More information about the Bf-blender-cvs
mailing list