Blender Git Loki

Fix T82423: Replace duplicate name in keymap

The two entries `TFM_MODAL_AUTOCONSTRAINT` and
`TFM_MODAL_AUTOCONSTRAINTPLANE` had the same name
displayed in the UI. The latter is now includes
"plane" in it's name.

Reviewed By: mano-wii

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

Fix T80043: missing Cycles displacement update when relinking output sockets

Cleanup: Reduce variable scope

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

Fix T82428: Cycles crashes when building volume meshes

The Volume Node did not have all of the sockets from its Mesh base class
which are now required due to the recent socket API change.

pre-merge commit

View3D: take clipping into account for Frame All

Clamp the min/max used for Frame All/Selected
by the clipping region if it's set.

Resolve T81050

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

Conflicts:
source/blender/blenloader/intern/writefile.c
source/blender/editors/gpencil/gpencil_edit.c

XR: Add XR region type to View3D space type

Enables add-ons to draw to the XR surface and mirror window by
adding a View3D draw handler of region type 'XR' and draw type
'POST_VIEW'. Also allows individual toggling of controller drawing
and custom overlays.

Cleanup: move plane array intersection into a function

Also add check to ensure a point isn't occluded by it's own plane,
which could happen if a small epsilon values are passed in.

Merge branch 'master' into soc-2020-io-performance

XR: Draw controller overlays in mirror view

XR: Store multiple paths in GHOST_XrActionBinding

Facilitates action binding creation debugging by narrowing
errors down to an interaction profile and action.

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

# Conflicts:
# CMakeLists.txt
# source/blender/blenloader/intern/readfile.c
# source/blender/blenloader/intern/writefile.c

Merge branch 'master' into soc-2020-io-performance

XR: Check for valid stage reference space bounds

Even if the stage reference space is supported by the XR runtime, the
bounds may be invalid (0, 0) if the user did not define a tracking
space via the runtime's UI. In this case, fall back to the local
tracking space.

Fix for T78211: Trackpad Zoom to Mouse Position Error

When using a trackpad Zoom to Mouse Position would always zoom to center of canvas.

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

Reviewed by Brecht Van Lommel

Fix for T65714: Pinch Zooming Crash using Mac Trackpad

Ensure that Zoom does not crash on Mac Trackpad by checking for existence of Continuous Zoom timer.

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

Reviewed by Julian Eisel

Fix possible null-pointer dereference in new Outliner tree building code

Fixed handling of edge seam flags in dyntopo, for some reason did the
code was not brought over from trimesh branch.