Blender Git Loki

Cleanup: Line art naming changes.

Make variable naming consistent with struct names.

Reviewed By: Sebastian Parborg (zeddb)

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

Cleanup: Convert to static type directly from CPPType

Unreported fix: vertex colors overlay not set for new 3d views.

Found during researching {T86956}.

Fix T86956: VSE shading mode ignores Grease Pencil Vertex colors.

Issue is that due to the strange definition of render in grease pencil
(meaning should be rendered similar to rendering). This included normal
viewport rendering in OB_RENDER and OpenGL render in OB_RENDER.

For other rendering modes the overlay vertex opacity would be used. This
patch sets this value to 1 when rendering via a scene strip override.

NOTE: that this isn't a good solution as I expect that users want to use
the opacity of the Grease pencil object. Perhaps the GPencil team has a
better solution for it.

Bump FFmpeg version from 4.2.3 to 4.4

Merge branch 'blender-v2.93-release'

Fix T88551: Crash accessing uninitialized tool settings

Tool settings for sequencer were not initialized, which caused crash
when adding strips.

There was fix for same issue in versioning rB0f81dafe6cec, but
subversion was not bumped, so files with uninitialized tool settings
may still exist.

Add `SEQ_tool_settings_get()` accessor function that will initialize
tool settings if they are missing. Change operator code to use
`SEQ_tool_settings_fit_method_get()` function instead of accessing
tool settings directly

Reviewed By: campbellbarton

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

Minor cleanups.

LineArt: Cleaning up edge list names.

LineArt: Cleaning up naming convensions.

Cleanup: use nullptr

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

Cleanup: remove unused function

Cleanup: remove unnecessary lambda capture

Merge branch 'master' into override-recursive-resync

Fix T88549: ID sorting tests.

Forgot to initialize the ID types array...

Weird though that this only failed on Windows!

Thanks a lot to @deadpin for helping investigating this.

Merge branch 'master' into temp-attribute-processor

Merge remote-tracking branch 'origin/master' into asset-browser-poselib

support changing sockets

Fix T88464: Incorrect baking with camera markers.

This will update active camera based on the maker for each frame.

Reviewed By: Sebastian Parborg (zeddb), Antonio Vazquez (antoniov)

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