Blender Git Loki

Fix typo in Fly mode tooltip

The bug was always around and was introduced with the original code
e2a7168e9680f (2009).

Cleanup: Walk Navigation define remame

WALK_MODAL_TOGGLE > WALK_MODAL_GRAVITY_TOGGLE

Tracking: Fix "Lock to Selection" option from header causing jump

This change makes the behavior consistent between shortcut and
option from space clip's header.

The only caveat is that the "Lock to Selection" is removed from the
Display popover. This is because it is rather hard to make operator
to render same as regular checkbox. However, shouldn't be a problem
because the setting in popover was redundant.

Differential Revision: https://developer.blender.org/D10423

Fix cycles crash when changing viewport display pass

It was possible that render buffers and scene kernel data will be out
of sync because reset and scene update happens in different locks.

This is similar issue we've fixed in the Cycles X branch, so backported
relevant changes from there.

This change removes what seems to be unused feature kernel.

Differential Revision: https://developer.blender.org/D11828

Deps: upgrade OpenXR 1.0.14 ? 1.0.17

Simple upgrade of OpenXR to 1.0.17. A version bump was enough, no
Blender code had to change.

Reviewed By: LazyDodo, mont29

Differential Revision: https://developer.blender.org/D11848

Updated based on review by Habib Gahbiche

Merge branch 'soc-2021-vse-strip-thumbnails' of git.blender.org:blender into soc-2021-vse-strip-thumbnails

Merge branch 'master' into soc-2021-vse-strip-thumbnails

USD Export: fix skinned mesh writer build error.

adaptive_cloth: fix: Mesh: collapse_edge_triangulate(): delete node only if no other vert refers to it

adaptive_cloth: fix: Mesh: collapse_edge_triangulate() invalid faces generated

The edge between v1 and ov should be removed only if the edge doesn't have any linked faces. If it has any linked faces, it will make those faces invalid and cause problems down the line. For the face to have (v2, ov, vx), this becomes impossible since (v1, ov) has been removed, this is wrong.

Merge branch 'soc-2021-curve-fillet' of git.blender.org:blender into soc-2021-curve-fillet

Basic Curve Fillet node implementation

Basoc Curve Fillet node implementation

Cleanup: Fix typos, add deprecated comment to flag

Merge branch 'master' into curve-nodes-modifier

Rename id_properties_create to id_properties_ensure

Merge branch 'master' into refactor-idprop-ui-data

Array Brush: Fix scale, symmetry and rotation jittering

Merge branch 'master' into curve-sample-node