[Bf-blender-cvs] [f79dea97df9] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: f79dea97df923b7a1821876a3a34af4a20be8118
Author: YimingWu
Date:   Sat Aug 15 13:09:42 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBf79dea97df923b7a1821876a3a34af4a20be8118

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	source/blender/blenloader/intern/versioning_280.c

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_280.c
index 37cb04531f2,0d8f2eac99e..ab0ca12d1cb
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -5112,16 -5110,12 +5110,22 @@@ void blo_do_versions_280(FileData *fd, 
        }
      }
  
 +    for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +      if (!DNA_struct_find(fd->filesdna, "SceneLineart")) {
 +        for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +          scene->lineart.crease_threshold = 0.7f;
 +          scene->lineart.line_types |= LRT_EDGE_FLAG_ALL_TYPE;
 +          scene->lineart.flags |= LRT_ALLOW_DUPLI_OBJECTS;
 +        }
 +      }
 +    }
 +
+     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. */
    }
  }