Blender Git Loki

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

Fix ASAN warning after recent cleanup

rB78a5895c96 introduced a "use after scope" warning, where a buffer
from a lower scope was used later. The solution is to only use one
variable and store whether to use it more explicitely with a bool.

Properly gray out modifiers when FCurve has them turned off

Review feedback from Julian

* Improved multires projection some more in bmesh_interp.c

Merge branch 'master' into fcurve-modifier-panels

COde cleanup

USD importer: keep original UV map name.

Now keeping the USD UV primvar name as the Blender
UV map name. Currently, always using the default
name 'st', but this may be an arbitrary name in
the future.

Fix Bevel percent mode, and clamping for it too (T79898).

The code for Bevel's percent (and absolute) modes were pretty bogus.
It assumed, like the rest of the modes, that the offset lines are
parallel to the beveled edge. Which is not true for these modes,
though it accidentally works sometimes if the legs are equilength.
Also the clamping code for those modes was completey wrong.
It is too hard to really fix the clamping code for absolute mode,
but it is a little better now. Percent mode clamping is fixed.

Cleanup: clang-format

main exporter file: create smaller functions.

Cleanup: Remove unused function

Writers: use NonMovable, and NonCopyable.

Cleanup: edit comments as per policy, function and variable names.

clang-tidy mismatched or missing arg names; else-after-return.

No functional change.

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

Fluid: Fix for issues with external forces

A general refactor / fix commit that should clear out the issues that have been reported on external forces and moving effectors (e.g. T79537, T81660, T80088).

Fluid: Add versioning for fluid particle physics type

Setting this type is required to prevent fluid particles from being treated like physics particles. The actual fix for this was made in rB11a8a6d0e6b5.

Fix for T81400: Block Width Corrections

Scale widths of popovers and dialogs with Text Style font point changes.

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

Reviewed by Hans Goudey

Merge branch 'master' into xr-actions-D9124