diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-09-30 09:12:51 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-09-30 09:12:51 +0300 |
commit | 192e591af9fb240fbdf077e0c1b7a95d136713ef (patch) | |
tree | 232ae9c7d15bada94722501b04657b6b5908126c /source/blender | |
parent | 0016e73eda906140a189aa2233f1342a7526ddbd (diff) |
Version: Blender 2.83.7 releasev2.83.7
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 9a9f18c3dec..122651230b3 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -32,11 +32,11 @@ /* Blender patch version for bugfix releases. */ #define BLENDER_VERSION_PATCH 7 /** Blender release cycle stage: alpha/beta/rc/release. */ -#define BLENDER_VERSION_CYCLE beta +#define BLENDER_VERSION_CYCLE release /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 19 +#define BLENDER_FILE_SUBVERSION 20 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 7e6939f2114..d7a5d54b3f6 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -5074,6 +5074,14 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } + if (!MAIN_VERSION_ATLEAST(bmain, 283, 20)) { + for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) { + /* Don't rotate light with the viewer by default, make it fixed. Shading settings can't be + * edited and this flag should always be set. So we can always execute this. */ + wm->xr.session_settings.shading.flag |= V3D_SHADING_WORLD_ORIENTATION; + } + } + /** * Versioning code until next subversion bump goes here. * @@ -5085,12 +5093,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) * \note Keep this message at the bottom of the function. */ { - for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) { - /* Don't rotate light with the viewer by default, make it fixed. Shading settings can't be - * edited and this flag should always be set. So we can always execute this. */ - wm->xr.session_settings.shading.flag |= V3D_SHADING_WORLD_ORIENTATION; - } - /* Keep this block, even when empty. */ } } |