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/editors/space_view3d/view3d_view.c | |
parent | d117520aa28f0d8a86eb6675836261e6426761cf (diff) | |
parent | b3c08a3a0a9b0cd9e66bbf4bdeeedb6c2c5e7c76 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index ff9673a4262..b986ebb75b6 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1732,6 +1732,8 @@ void ED_view3d_xr_shading_update(wmWindowManager *wm, const View3D *v3d, const S { if (v3d->runtime.flag & V3D_RUNTIME_XR_SESSION_ROOT) { View3DShading *xr_shading = &wm->xr.session_settings.shading; + /* Flags that shouldn't be overridden by the 3D View shading. */ + const int flag_copy = V3D_SHADING_WORLD_ORIENTATION; BLI_assert(WM_xr_session_exists(&wm->xr)); @@ -1749,7 +1751,9 @@ void ED_view3d_xr_shading_update(wmWindowManager *wm, const View3D *v3d, const S } /* Copy shading from View3D to VR view. */ + const int old_xr_shading_flag = xr_shading->flag; *xr_shading = v3d->shading; + xr_shading->flag = (xr_shading->flag & ~flag_copy) | (old_xr_shading_flag & flag_copy); if (v3d->shading.prop) { xr_shading->prop = IDP_CopyProperty(xr_shading->prop); } |