Blender Git Loki

Merge branch 'temp-gpencil-bezier-stroke-type' of git.blender.org:blender into temp-gpencil-bezier-stroke-type

GPencil: Fix merge issues

GPencil: Add weight transfer for cyclic strokes

This adds the code that transfers the weights for cyclic bezier strokes
to the polyline.

Merge branch 'master' into temp-gpencil-bezier-stroke-type

Conflicts:
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_edit.c

Merge branch 'master' into greasepencil-object

Merge branch 'blender-v2.93-release'

Fix T85051: Add bisect distance as a parameter to the mirror modifier

The `bisect_distance` in the mirror modifier was hard-coded to `0.001`.
This would result in some unexpected behavior like vertices close
to the mirror plane being deleted or merged.

The fix now adds a parameter to the mirror modifier to expose the
bisect distance to the user. The default is set to the previous
hard-coded value to not "change" previous files.

Ref D10201

Merge branch 'blender-v2.93-release'

VSE: Fix movies are reloaded after invalidation

When cache is strip is invalidated, movie file was reloaded even if it
isn't necessary. This caused significant performance issues when strip
is being dragged under playhead.

This was caused by calling `SEQ_relations_sequence_free_anim()` and it
was introduced as fix for T36124.

When it is necessary to reload file because another API holds reference
to ImBuf, do this explicitly besides cache invalidation.

In `rna_ColorManagedColorspaceSettings_reload_update()` this was already
done, so no change is needed there.

Reviewed By: sergey

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

Fix T87337: Text strip draws white outline

Math for drawing font over byte buffer was incorrect. Effect can be seen
when target buffer is fully black and transparent - this results in font
color being effectively premultiplied, which causes problems when image
is composited further.

Use `blend_color_mix_byte()` and `blend_color_mix_float()` for blending.

Reviewed By: sergey

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

Fix T86682: Scene strip DOF not evaluated correctly

Camera object used for rendering reffered to original not evaluated data.

Use `DEG_get_evaluated_object()` to get evaluated camera.

Reviewed By: sergey

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

Geometry Nodes Curves: Refactor NURBS sampling

This is basically a template for a similar thing I'll do to bezier
splines. The idea is that every spline type is responsible for the
mapping of values from orginal control points to the evaluated
points based on a given resolution, and then the base class will
handle the rest.

This commit leaves the branch in a half-refactored state.

LineArt: Global overrides for cached calculation.

LineArt: Fix cache allocation error.

Fix errors in Buffer.dimensions `setter`

- Error accessing the length from a sequence.
- Error comparing a boolean to -1.

Issues introduced in 19360c2c1cf50c80b9720137b88db2c2f3626ddc

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

USD Import: UMM logic update.

UMM conversion code now invokes Python
omni.universalmaterialmap.blender.material.apply_data_to_instance().

EEVEE: Fix use after free crash

Merge branch 'blender-v2.93-release'

Fix wrong flag for 'GPUFrameBuffer.viewport_get'

`GPUFrameBuffer.viewport_get` has no args.