Blender Git Loki

Curve modifiers: Disable 'Apply on Spline' option if not available

Some curve modifiers (namely Hook, SoftBody and MeshDeform) can only work
on pre-tesselated spline points.

Before the modifier UI refactor in rB9b099c86123f, users would get the
'Apply on Spline' option, but disabled and with a tip explaining why
this cant be changed. After rB9b099c86123f though, this button was
always enabled [but disfunctional] leaving the user without an
explanation why this has no effect.

Now restore this functionality since it is quite important information.
Additionally, this button now appears to be ON in these cases which
makes more sense from the user perspective (so it does not represent the
actual setting on the modifier -- this would internally be switched ON in
the modifier calculation anyways though, see
'curve_get_tessellate_point')

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

Merge branch 'blender-v2.93-release'

Merge branch 'blender-v2.93-release'

Fix T87562: Keymap preferences from 2.92x ignored

Renaming presets in 01d49d1542cee0da2a7629443f9534bc5cec5a55
caused them to be treated as separate key-maps.

BLI_string: add a utility to replace strings using a table

Useful to simplify versioning code when identifiers need updating
in multiple places.

LineArt: Fix crashing when tile triangle count exceeds 100.

LineArt: Use array for ba->linked_triangles.

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

Merge branch 'blender-v2.93-release'

Fix logging "bke.appdir" messages

Logging was initialized after BKE_appdir paths were initialized,
making it impossible to see paths which are checked on startup.

USD Export: Light Intensity Scale option.

Replaced hard-coded light intensity scaling with a
user specified light_intensity_scale export option.

USD Export: format fixes.

USD Export: backward compatible light attributes.

Light attributes in USD v21.02 now have an inputs:
prefix (e.g., inputs:color, inputs:intensity, etc.).
Added logic to also output light attributes using the
old naming scheme (without the inputs: prefix), so that
applications built with older USD versions can recognize
these attributes.

* Fixed vcol drawing in indexed smooth shading mode

Merge branch 'master' into sculpt-dev

Correction to previous commit: Avoid unnecessary notifier

Not a big deal, but nice to avoid notifiers when no change was done.

Assets: Add BPY function to mark and clear assets

Adds `mark_asset()` and `clear_asset()` to ID data-blocks, e.g.
`bpy.context.active_object.mark_asset()`. They essentially do the same as the
mark and clear asset operators.

Scripts are generally discouraged from using operators where possible, but we
need to provide API functions to use instead. In this case it means scripts
don't have to override context to pass an ID to the operator.

Merge branch 'master' into geometry-nodes-curve-support

Geometry Nodes Curves: Sample positions from NURBS curves

Merge branch 'nv-usd-importer' of https://gitlab-master.nvidia.com/omniverse/blender into omniverse