Blender Git Loki

Cleanup: replace NULL with nullptr - use brackets around if

Merge branch 'master' into temp-lineart-contained

LineArt: Fixed source selection for nested-instanced collection.

Fix T86730: LineArt: keep contour when there's perpendicular faces.

GPencil: Use debug messages

LineArt: Fixed source selection for nested-instanced collection.

WIP curve pen

GPencil: Initial curve pen functionality

GPencil: WIP curve pen tool for drawing curves

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

Merge branch 'master' into temp-gpencil-io

Join curves: compensate for different bevel depths

When joining curves, the resulting curve will inherit the bevel depth of
the active curve, but the radii would stay the same which leads to
changed appearance when joining.

Now compensate for this taking the different bevel depths into account
(if present).

Was a feature request here (and I also think we had reports about this
-- which were usually turned down as not-a-bug):
https://blender.community/c/rightclickselect/bhhbbc/

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

Fix T86730: LineArt: keep contour when there's perpendicular faces.

Merge from master

Fix issues introduced strip loading refactoring

- Adding effect strip resulted in strip with no name
- Adding sound strip attempted to read `fit_method` RNA property,
that did not exist, causing error messages in console

These issues were introduced in bbb1936411a5.

Fix T86355: Added effect strip has wrong length

SEQ_add_effect_strip used SeqLoadData.image.end_frame to set end
frame. This was mistake introduced in last refactoring patch.

Use effect data, not image data, when adding effect strips.

Reviewed By: sergey

Differential Revision: D10633

Fix T85824: Transition between adjustment regression

When transition effect is placed between 2 adjustment layer strips,
only first adjustment layer was rendered by effect.

Limit timeline_frame range to adjustment strip frame range.

This timeline configuration is technically invalid, because strips
should overlap when using transition effect. This was never restricted
and instead of producing no image, transition effect used first and
last frame of source strip. Many users got used to this "feature" so
I think it make sense to fix this case so it behaves like other strip
types.

Reviewed By: sergey

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

VSE UI: Cleanup scene panel style

- Make properties alligned
- Add decorate to volume
- Add heading to Grease Pencil and Transparent

Reviewed By: ISS

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

VSE: Preview images when moving strip handles

Add option to override current frame whem transforming strip handles.
Option can be found in View menu of VSE preview, or in timeline when
using backdrop.

Reviewed By: ISS

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

VSE: Text strip improvements

- Position text in center of image
- Increase default font size so it's more visible
- Increase font size limit
- Increase limit for location, so text can be scolled off screen
- Wrap text by default
- Tweak default box and shadow color
- Change text shadow position
- Text box no longer casts shadow

Reviewed By: ISS

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