diff options
author | Julian Eisel <julian@blender.org> | 2020-08-14 18:18:09 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-08-14 18:18:09 +0300 |
commit | e8dfe91767bd87c0499de1edbc721ef928e893d7 (patch) | |
tree | ab2d921a6eda9837efc7f9de4cb3abee72985192 /source/blender/blenloader/intern/versioning_280.c | |
parent | d117520aa28f0d8a86eb6675836261e6426761cf (diff) | |
parent | b3c08a3a0a9b0cd9e66bbf4bdeeedb6c2c5e7c76 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/blenloader/intern/versioning_280.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index fced95ee629..0d8f2eac99e 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -4953,8 +4953,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) const View3D *v3d_default = DNA_struct_default_get(View3D); wm->xr.session_settings.shading = v3d_default->shading; - /* Don't rotate light with the viewer by default, make it fixed. */ - wm->xr.session_settings.shading.flag |= V3D_SHADING_WORLD_ORIENTATION; wm->xr.session_settings.draw_flags = (V3D_OFSDRAW_SHOW_GRIDFLOOR | V3D_OFSDRAW_SHOW_ANNOTATION); wm->xr.session_settings.clip_start = v3d_default->clip_start; @@ -5112,6 +5110,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } + 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. */ } } |