Blender Git Loki

LineArt: Offset strokes instead of In Front.

Merge branch 'blender-v2.93-release'

Spreadsheet: combine vector/color spreadsheet columns

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

GPencil: Enable cyclic stroke fitting

This was overlooked during the last refactor.

GPencil: Return true if handles were recalcualted

GPencil: Subdivide curve segment factor

Add a helper function to subdivide a curve segment at a specific factor

Merge branch 'temp-gpu-compute-shaders' into temp-gpu-compute-shader-hair

Fix issue where library glsl isn't included for compute shaders.

Merge branch 'master' into temp-gpu-compute-shaders

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

Remove print during compilation.

Splines: Cleanup, add comments, formatting

Cleanup: inconsistent naming for screen editing variables & args

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

Merge branch 'blender-v2.93-release'

Fix (unreported): Geometry nodes instance ids not copied or cleared

Though to my knowledge we haven't had a report about this yet, this
looks like a clear oversight-- the ids are just more data stored by the
instances component, and should be cleared and copied like other data.

This might have resulted in incorrect random IDs for instances in
renderers in some cases where the component had to be copied.

Splines: Cleanup, add comment

Splines: Rename DCurve to SplineGroup

Fix T87777: Fix typo in Prefs Scripts Dir tooltip

Correction to Prefs tooltip mention of 'add-ons' folder in Scripts Dir.

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

Reviewed by Harley Acheson

UI: Adding Constraint to the Area Join Operations

Removing mid-operation area re-targeting for safety and predictability.

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

Reviewed by Campbell Barton